diff --git a/ExtendedWPFToolkitSolution/DotNetProjects.Xceed.Wpf.DataGrid.sln b/ExtendedWPFToolkitSolution/DotNetProjects.Xceed.Wpf.DataGrid.sln
new file mode 100644
index 00000000..4b326593
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/DotNetProjects.Xceed.Wpf.DataGrid.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31019.35
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.DataGrid", "Src\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj", "{63648392-6CE9-4A60-96D4-F9FD718D29B0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {10BA5F90-D450-4394-AAC4-225D67CA0E65}
+	EndGlobalSection
+EndGlobal
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
index 9d14d5b5..9ed3d84b 100644
--- 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
@@ -59,12 +59,6 @@
     <Compile Include="AeroTheme.cs" />
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
-      <Project>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</Project>
-      <Name>Xceed.Wpf.AvalonDock</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Page Include="Brushes.xaml">
       <Generator>MSBuild:Compile</Generator>
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
index 4b473bc5..2bba2a25 100644
--- 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
@@ -104,12 +104,6 @@
     <Resource Include="Images\PinRestore_Dark.png" />
     <Resource Include="Images\VTabGroup.png" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
-      <Project>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</Project>
-      <Name>Xceed.Wpf.AvalonDock</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
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
index 9cacc0d0..4914f6a8 100644
--- 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
@@ -112,12 +112,6 @@
     <Resource Include="Images\PinMaximize_Dark.png" />
     <Resource Include="Images\PinRestore_Dark.png" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
-      <Project>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</Project>
-      <Name>Xceed.Wpf.AvalonDock</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\PinDocMenu_Black.png" />
   </ItemGroup>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
deleted file mode 100644
index c6ea985d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/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/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/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3800cc83..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.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.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-using System.Windows.Markup;
-using System;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Xceed 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
-
-
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 3e1a745a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xceed.Wpf.AvalonDock</RootNamespace>
-    <AssemblyName>Xceed.Wpf.AvalonDock</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyVersionInfo.cs" />
-    <Compile Include="AssemblyVersionInfoCommon.cs" />
-    <Compile Include="Commands\RelayCommand.cs" />
-    <Compile Include="Controls\AnchorablePaneControlOverlayArea.cs" />
-    <Compile Include="Controls\AnchorablePaneDropTarget.cs" />
-    <Compile Include="Controls\AnchorablePaneTabPanel.cs" />
-    <Compile Include="Controls\AnchorablePaneTitle.cs" />
-    <Compile Include="Controls\AutoHideWindowManager.cs" />
-    <Compile Include="Controls\BindingHelper.cs" />
-    <Compile Include="Controls\ContextMenuEx.cs" />
-    <Compile Include="Controls\FullWeakDictionary.cs" />
-    <Compile Include="Controls\DocumentPaneDropAsAnchorableTarget.cs" />
-    <Compile Include="Controls\DocumentPaneGroupDropTarget.cs" />
-    <Compile Include="Controls\DropDownButton.cs" />
-    <Compile Include="Controls\DropDownControlArea.cs" />
-    <Compile Include="Controls\DropTargetBase.cs" />
-    <Compile Include="Controls\WeakDictionary.cs" />
-    <Compile Include="Controls\WindowActivateEventArgs.cs" />
-    <Compile Include="Controls\WindowHookHandler.cs" />
-    <Compile Include="Controls\FocusElementManager.cs" />
-    <Compile Include="Controls\LayoutAnchorableItem.cs" />
-    <Compile Include="Controls\LayoutDocumentItem.cs" />
-    <Compile Include="Controls\LayoutItem.cs" />
-    <Compile Include="Controls\MenuItemEx.cs" />
-    <Compile Include="Controls\NavigatorWindow.cs" />
-    <Compile Include="Controls\ReentrantFlag.cs" />
-    <Compile Include="Controls\Shell\Standard\ComGuids.cs" />
-    <Compile Include="Controls\Shell\Standard\Debug.cs" />
-    <Compile Include="Controls\Shell\Standard\DoubleUtil.cs" />
-    <Compile Include="Controls\Shell\Standard\DpiHelper.cs" />
-    <Compile Include="Controls\Shell\Standard\ErrorCodes.cs" />
-    <Compile Include="Controls\Shell\Standard\MessageWindow.cs" />
-    <Compile Include="Controls\Shell\Standard\NativeMethods.cs" />
-    <Compile Include="Controls\Shell\Standard\ShellProvider.cs" />
-    <Compile Include="Controls\Shell\Standard\StreamHelper.cs" />
-    <Compile Include="Controls\Shell\Standard\Utilities.cs" />
-    <Compile Include="Controls\Shell\Standard\Verify.cs" />
-    <Compile Include="Controls\Shell\SystemCommands.cs" />
-    <Compile Include="Controls\Shell\SystemParameters2.cs" />
-    <Compile Include="Controls\Shell\WindowChrome.cs" />
-    <Compile Include="Controls\Shell\WindowChromeWorker.cs" />
-    <Compile Include="Converters\ActivateCommandLayoutItemFromLayoutModelConverter.cs" />
-    <Compile Include="Converters\AnchorableContextMenuHideVisibilityConverter.cs" />
-    <Compile Include="Converters\AutoHideCommandLayoutItemFromLayoutModelConverter.cs" />
-    <Compile Include="Converters\HideCommandLayoutItemFromLayoutModelConverter.cs" />
-    <Compile Include="Converters\InverseBoolToVisibilityConverter.cs" />
-    <Compile Include="Converters\LayoutItemFromLayoutModelConverter.cs" />
-    <Compile Include="Converters\NullToDoNothingConverter.cs" />
-    <Compile Include="Converters\UriSourceToBitmapImageConverter.cs" />
-    <Compile Include="DocumentClosedEventArgs.cs" />
-    <Compile Include="DocumentClosingEventArgs.cs" />
-    <Compile Include="Extentions.cs" />
-    <Compile Include="LayoutEventArgs.cs" />
-    <Compile Include="Layout\AnchorableShowStrategy.cs" />
-    <Compile Include="Layout\AnchorSide.cs" />
-    <Compile Include="Controls\DockingManagerDropTarget.cs" />
-    <Compile Include="Controls\DockingManagerOverlayArea.cs" />
-    <Compile Include="Controls\DocumentPaneControlOverlayArea.cs" />
-    <Compile Include="Controls\DocumentPaneDropTarget.cs" />
-    <Compile Include="Controls\DocumentPaneTabPanel.cs" />
-    <Compile Include="Controls\DragService.cs" />
-    <Compile Include="Controls\DropArea.cs" />
-    <Compile Include="Controls\DropTarget.cs" />
-    <Compile Include="Controls\DropTargetType.cs" />
-    <Compile Include="Controls\Extentions.cs" />
-    <Compile Include="Controls\IDropTarget.cs" />
-    <Compile Include="Controls\LayoutAnchorableControl.cs" />
-    <Compile Include="Controls\LayoutAnchorableFloatingWindowControl.cs" />
-    <Compile Include="Controls\LayoutAnchorablePaneControl.cs" />
-    <Compile Include="Controls\LayoutAnchorablePaneGroupControl.cs" />
-    <Compile Include="Controls\LayoutAnchorableTabItem.cs" />
-    <Compile Include="Controls\LayoutAnchorControl.cs" />
-    <Compile Include="Controls\LayoutAnchorGroupControl.cs" />
-    <Compile Include="Controls\LayoutAnchorSideControl.cs" />
-    <Compile Include="Controls\LayoutDocumentControl.cs" />
-    <Compile Include="Controls\LayoutDocumentFloatingWindowControl.cs" />
-    <Compile Include="Controls\LayoutDocumentPaneControl.cs" />
-    <Compile Include="Controls\LayoutDocumentPaneGroupControl.cs" />
-    <Compile Include="Controls\LayoutDocumentTabItem.cs" />
-    <Compile Include="Controls\LayoutFloatingWindowControl.cs" />
-    <Compile Include="Controls\LayoutGridControl.cs" />
-    <Compile Include="Controls\LayoutGridResizerControl.cs" />
-    <Compile Include="Controls\LayoutPanelControl.cs" />
-    <Compile Include="Controls\OverlayArea.cs" />
-    <Compile Include="Controls\OverlayWindow.cs" />
-    <Compile Include="Controls\OverlayWindowDropTarget.cs" />
-    <Compile Include="Controls\OverlayWindowDropTargetType.cs" />
-    <Compile Include="Controls\TransformExtentions.cs" />
-    <Compile Include="Converters\AnchorSideToAngleConverter.cs" />
-    <Compile Include="Converters\AnchorSideToOrientationConverter.cs" />
-    <Compile Include="Converters\BoolToVisibilityConverter.cs" />
-    <Compile Include="DockingManager.cs" />
-    <Compile Include="Layout\ChildrenTreeChangedEventArgs.cs" />
-    <Compile Include="Layout\Extentions.cs" />
-    <Compile Include="Layout\ILayoutAnchorablePane.cs" />
-    <Compile Include="Layout\ILayoutContainer.cs" />
-    <Compile Include="Layout\ILayoutContentSelector.cs" />
-    <Compile Include="Layout\ILayoutControl.cs" />
-    <Compile Include="Layout\ILayoutDocumentPane.cs" />
-    <Compile Include="Layout\ILayoutElement.cs" />
-    <Compile Include="Layout\ILayoutElementWithVisibility.cs" />
-    <Compile Include="Layout\ILayoutGroup.cs" />
-    <Compile Include="Layout\ILayoutOrientableElement.cs" />
-    <Compile Include="Layout\ILayoutPane.cs" />
-    <Compile Include="Layout\ILayoutPanelElement.cs" />
-    <Compile Include="Layout\ILayoutPaneSerializable.cs" />
-    <Compile Include="Layout\ILayoutPositionableElement.cs" />
-    <Compile Include="Layout\ILayoutPreviousContainer.cs" />
-    <Compile Include="Layout\ILayoutRoot.cs" />
-    <Compile Include="Controls\IOverlayWindow.cs" />
-    <Compile Include="Controls\IOverlayWindowArea.cs" />
-    <Compile Include="Controls\IOverlayWindowDropTarget.cs" />
-    <Compile Include="Controls\IOverlayWindowHost.cs" />
-    <Compile Include="Layout\ILayoutUpdateStrategy.cs" />
-    <Compile Include="Layout\LayoutAnchorable.cs" />
-    <Compile Include="Layout\LayoutAnchorableFloatingWindow.cs" />
-    <Compile Include="Layout\LayoutAnchorablePane.cs" />
-    <Compile Include="Layout\LayoutAnchorablePaneGroup.cs" />
-    <Compile Include="Layout\LayoutAnchorGroup.cs" />
-    <Compile Include="Layout\LayoutAnchorSide.cs" />
-    <Compile Include="Controls\LayoutAutoHideWindowControl.cs" />
-    <Compile Include="Layout\LayoutContent.cs" />
-    <Compile Include="Layout\LayoutDocument.cs" />
-    <Compile Include="Layout\LayoutDocumentFloatingWindow.cs" />
-    <Compile Include="Layout\LayoutDocumentPane.cs" />
-    <Compile Include="Layout\LayoutDocumentPaneGroup.cs" />
-    <Compile Include="Layout\LayoutElement.cs" />
-    <Compile Include="Layout\LayoutElementEventArgs.cs" />
-    <Compile Include="Layout\LayoutFloatingWindow.cs" />
-    <Compile Include="Layout\LayoutGroup.cs" />
-    <Compile Include="Layout\LayoutGroupBase.cs" />
-    <Compile Include="Layout\LayoutPanel.cs" />
-    <Compile Include="Layout\LayoutPositionableGroup.cs" />
-    <Compile Include="Layout\LayoutRoot.cs" />
-    <Compile Include="Layout\Serialization\LayoutSerializationCallbackEventArgs.cs" />
-    <Compile Include="Layout\Serialization\LayoutSerializer.cs" />
-    <Compile Include="Layout\Serialization\XmlLayoutSerializer.cs" />
-    <Compile Include="MathHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.de.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.de.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.es.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.es.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.fr.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.fr.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.hu.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.hu.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.it.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.it.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.pt-BR.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.pt-BR.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.ro.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.ro.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.ru.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.ru.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.sv.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.sv.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.zh-Hans.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.zh-Hans.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Themes\DictionaryTheme.cs" />
-    <Compile Include="Themes\GenericTheme.cs" />
-    <Compile Include="Themes\Theme.cs" />
-    <Compile Include="Win32Helper.cs" />
-    <Compile Include="WindowHelper.cs" />
-    <EmbeddedResource Include="Properties\Resources.hu.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.hu.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.it.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.it.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.fr.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.fr.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.es.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.es.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.pt-BR.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.pt-BR.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.ru.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.ru.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.de.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.de.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.sv.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.sv.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.zh-Hans.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.zh-Hans.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.ro.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.ro.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Themes\Generic\Images\DockBottom.PNG" />
-    <Resource Include="Themes\Generic\Images\DockLeft.PNG" />
-    <Resource Include="Themes\Generic\Images\DockPane.PNG" />
-    <Resource Include="Themes\Generic\Images\DockPaneEmpty.png" />
-    <Resource Include="Themes\Generic\Images\DockRight.PNG" />
-    <Resource Include="Themes\Generic\Images\DockTop.PNG" />
-    <Resource Include="Themes\Generic\Images\HTabGroup.png" />
-    <Resource Include="Themes\Generic\Images\InnerDockDocPaneBottom.png" />
-    <Resource Include="Themes\Generic\Images\InnerDockDocPaneLeft.png" />
-    <Resource Include="Themes\Generic\Images\InnerDockDocPaneRight.png" />
-    <Resource Include="Themes\Generic\Images\InnerDockDocPaneTop.png" />
-    <Resource Include="Themes\Generic\Images\InnerDockPaneBottom.png" />
-    <Resource Include="Themes\Generic\Images\InnerDockPaneInside.png" />
-    <Resource Include="Themes\Generic\Images\InnerDockPaneLeft.png" />
-    <Resource Include="Themes\Generic\Images\InnerDockPaneRight.png" />
-    <Resource Include="Themes\Generic\Images\InnerDockPaneTop.png" />
-    <Resource Include="Themes\Generic\Images\Locked.png" />
-    <Resource Include="Themes\Generic\Images\PinAutoHide.png" />
-    <Resource Include="Themes\Generic\Images\PinClose.png" />
-    <Resource Include="Themes\Generic\Images\PinDocMenu.png" />
-    <Resource Include="Themes\Generic\Images\PinMenu.png" />
-    <Resource Include="Themes\Generic\Images\VTabGroup.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Themes\Generic\Images\PinMaximize.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Themes\Generic\Images\PinRestore.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Themes\generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72e591d6-8f83-4d8c-8f67-9c325e623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/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/DefaultCellEditorSelector.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
index 4fe53870..0f8c3d77 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
@@ -18,11 +18,11 @@
                   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">
+                  xmlns:s="clr-namespace:System;assembly=mscorlib"
+                  xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit">
   <FrameworkElement.Resources>
 
     <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
index 74743f09..aed6cd0c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
@@ -1050,12 +1050,10 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72e591d6-8f83-4d8c-8f67-9c325e623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
+    <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit">
+      <Version>4.6.96</Version>
+    </PackageReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <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)">
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/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/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
deleted file mode 100644
index fa0d2b02..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "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.*" )]
-[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/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/Converters/FlagPathConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.cs
deleted file mode 100644
index ec30f4b6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.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.Data;
-using Xceed.Wpf.Samples.SampleData;
-using System.Globalization;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters
-{
-  public class FlagPathConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      // Use FlagsProvider to get Flags since it caches every BitmapImages it created.
-      // This optimizes the converter.
-      return FlagsProvider.Instance.GetFlagFromCountryName( value as string );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return DependencyProperty.UnsetValue;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/OpenSourceImages/MultiColumnsComboBox.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/OpenSourceImages/MultiColumnsComboBox.png
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 75a2ecac..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj
+++ /dev/null
@@ -1,1452 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xceed.Wpf.Toolkit.LiveExplorer</RootNamespace>
-    <AssemblyName>Xceed.Wpf.Toolkit.LiveExplorer</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ProductName>Xceed 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>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>App.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.Services.Client" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.Samples.SampleData">
-      <HintPath>..\..\Libs\Xceed.Wpf.Samples.SampleData.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj">
-      <Project>{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}</Project>
-      <Name>Xceed.Wpf.AvalonDock.Themes.Aero</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj">
-      <Project>{89286EB4-B4A1-418C-839A-067B00F442D8}</Project>
-      <Name>Xceed.Wpf.AvalonDock.Themes.Metro</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj">
-      <Project>{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}</Project>
-      <Name>Xceed.Wpf.AvalonDock.Themes.VS2010</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
-      <Project>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</Project>
-      <Name>Xceed.Wpf.AvalonDock</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj">
-      <Project>{63648392-6CE9-4A60-96D4-F9FD718D29B0}</Project>
-      <Name>Xceed.Wpf.DataGrid</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="CodeBox.cs" />
-    <Compile Include="Core\Converters\ZeroToBoolConverter.cs" />
-    <Compile Include="Core\CSharpFormatter.cs" />
-    <Compile Include="Core\XamlFormatter.cs" />
-    <Compile Include="HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\AvalonDock\Views\AvalonDockView.xaml.cs">
-      <DependentUpon>AvalonDockView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\BusyIndicator\Converters\IntegerToTimespanConverter.cs" />
-    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml.cs">
-      <DependentUpon>BusyIndicatorCustomContentTemplateView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml.cs">
-      <DependentUpon>BusyIndicatorCustomContentView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorView.xaml.cs">
-      <DependentUpon>BusyIndicatorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Button\Views\IconButtonView.xaml.cs">
-      <DependentUpon>IconButtonView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Button\Views\ButtonSpinnerView.xaml.cs">
-      <DependentUpon>ButtonSpinnerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Button\Views\DropDownSplitButtonView.xaml.cs">
-      <DependentUpon>DropDownSplitButtonView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Calculator\Views\CalculatorView.xaml.cs">
-      <DependentUpon>CalculatorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Converters\GraduationModeToComboBoxConverter.cs" />
-    <Compile Include="Samples\Chart\Views\ChartAxisView.xaml.cs">
-      <DependentUpon>ChartAxisView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartLegendView.xaml.cs">
-      <DependentUpon>ChartLegendView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartSeriesBasicTypesView.xaml.cs">
-      <DependentUpon>ChartSeriesBasicTypesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml.cs">
-      <DependentUpon>ChartSeriesDataPointsBindingView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartStylingAxesGridView.xaml.cs">
-      <DependentUpon>ChartStylingAxesGridView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartStylingColumnSeriesView.xaml.cs">
-      <DependentUpon>ChartStylingColumnSeriesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartStylingLineSeriesView.xaml.cs">
-      <DependentUpon>ChartStylingLineSeriesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartStylingPieSeriesView.xaml.cs">
-      <DependentUpon>ChartStylingPieSeriesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\CheckLists\Views\CheckListsView.xaml.cs">
-      <DependentUpon>CheckListsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Color\Views\ColorView.xaml.cs">
-      <DependentUpon>ColorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\DataGrid\Converters\FlagPathConverter.cs" />
-    <Compile Include="Samples\DataGrid\UniqueIDCellValidationRule.cs" />
-    <Compile Include="Samples\DataGrid\Views\DataGridView.xaml.cs">
-      <DependentUpon>DataGridView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\DataGrid\Views\MultiColumnComboBoxView.xaml.cs">
-      <DependentUpon>MultiColumnComboBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\DateTime\Converters\CustomFormatToBoolConverter.cs" />
-    <Compile Include="Samples\DateTime\Converters\DateTimeToTimeSpanConverter.cs" />
-    <Compile Include="Samples\DateTime\Views\DateTimeView.xaml.cs">
-      <DependentUpon>DateTimeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\FilePicker\Views\FilePickerView.xaml.cs">
-      <DependentUpon>FilePickerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Gauge\Views\RadialGaugeView.xaml.cs">
-      <DependentUpon>RadialGaugeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\ListBox\Converters\BoxArtImageSourceConverter.cs" />
-    <Compile Include="Samples\ListBox\Views\ListBoxView.xaml.cs">
-      <DependentUpon>ListBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Magnifier\Converters\ColorConverter.cs" />
-    <Compile Include="Samples\Magnifier\Converters\VisibilityConverter.cs" />
-    <Compile Include="Samples\Magnifier\Views\MagnifierView.xaml.cs">
-      <DependentUpon>MagnifierView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Converters\EqualsMinusOneConverter.cs" />
-    <Compile Include="Samples\MaterialControls\Data\RequiredRule.cs" />
-    <Compile Include="Samples\MaterialControls\Views\MaterialHamburgerView.xaml.cs">
-      <DependentUpon>MaterialHamburgerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialComboBoxView.xaml.cs">
-      <DependentUpon>MaterialComboBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialDemoView.cs" />
-    <Compile Include="Samples\MaterialControls\Views\MaterialListBoxView.xaml.cs">
-      <DependentUpon>MaterialListBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialToolTipView.xaml.cs">
-      <DependentUpon>MaterialToolTipView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialDropDownView.xaml.cs">
-      <DependentUpon>MaterialDropDownView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialSwitchView.xaml.cs">
-      <DependentUpon>MaterialSwitchView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialFrameView.xaml.cs">
-      <DependentUpon>MaterialFrameView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialTabsView.xaml.cs">
-      <DependentUpon>MaterialTabsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml.cs">
-      <DependentUpon>MaterialProgressBarCircularView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialProgressBarView.xaml.cs">
-      <DependentUpon>MaterialProgressBarView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialRadioButtonView.xaml.cs">
-      <DependentUpon>MaterialRadioButtonView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialCheckBoxView.xaml.cs">
-      <DependentUpon>MaterialCheckBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialToastView.xaml.cs">
-      <DependentUpon>MaterialToastView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialSliderView.xaml.cs">
-      <DependentUpon>MaterialSliderView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialTextFieldView.xaml.cs">
-      <DependentUpon>MaterialTextFieldView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialButtonView.xaml.cs">
-      <DependentUpon>MaterialButtonView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialControlsView.xaml.cs">
-      <DependentUpon>MaterialControlsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MultiCalendar\Views\MultiCalendarView.xaml.cs">
-      <DependentUpon>MultiCalendarView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Numeric\Views\NumericView.xaml.cs">
-      <DependentUpon>NumericView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Panels\Converters\ComboBoxToVisibilityConverter.cs" />
-    <Compile Include="Samples\Panels\Views\SwitchPanelView.xaml.cs">
-      <DependentUpon>SwitchPanelView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Pie\Converters\SliceLabelConverter.cs" />
-    <Compile Include="Samples\Pie\Views\PieChartView.xaml.cs">
-      <DependentUpon>PieChartView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Pie\Views\PieProgressView.xaml.cs">
-      <DependentUpon>PieProgressView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Pie\Views\PieView.xaml.cs">
-      <DependentUpon>PieView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PileFlowPanel\Converters\FullNameStringConverter.cs" />
-    <Compile Include="Samples\PileFlowPanel\Views\PileFlowPanelView.xaml.cs">
-      <DependentUpon>PileFlowPanelView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Converters\DimensionConverter.cs" />
-    <Compile Include="Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml.cs">
-      <DependentUpon>LastNameUserControlEditor.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml.cs">
-      <DependentUpon>PropertyGridPropertyItemStyleView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml.cs">
-      <DependentUpon>PropertyGridDefinitionKeyView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml.cs">
-      <DependentUpon>PropertyGridEditorDefinitionsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml.cs">
-      <DependentUpon>PropertyGridAttributesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml.cs">
-      <DependentUpon>PropertyGridSelectedObjectView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml.cs">
-      <DependentUpon>PropertyGridCustomPropertyView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml.cs">
-      <DependentUpon>PropertyGridPropertiesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml.cs">
-      <DependentUpon>PropertyGridPropertiesSourceView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.Designer.cs">
-      <DependentUpon>DisplayLocalizationRes.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml.cs">
-      <DependentUpon>PropertyGridBindingToStructsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml.cs">
-      <DependentUpon>PropertyGridCategoryOrderView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml.cs">
-      <DependentUpon>PropertyGridCustomEditorsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml.cs">
-      <DependentUpon>PropertyGridDefaultEditorsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml.cs">
-      <DependentUpon>PropertyGridDisplayLocalizationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml.cs">
-      <DependentUpon>PropertyGridMultiSelectedObjectsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml.cs">
-      <DependentUpon>PropertyGridSpecifyingPropertiesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml.cs">
-      <DependentUpon>PropertyGridExpandingNonPrimitivesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridView.xaml.cs">
-      <DependentUpon>PropertyGridView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\RangeSlider\Converters\AbsoluteAdditionConverter.cs" />
-    <Compile Include="Samples\RangeSlider\Converters\RangeSliderEnabledConverter.cs" />
-    <Compile Include="Samples\RangeSlider\Views\RangeSliderView.xaml.cs">
-      <DependentUpon>RangeSliderView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Rating\Views\RatingView.xaml.cs">
-      <DependentUpon>RatingView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\SlideShow\Views\SlideShowView.xaml.cs">
-      <DependentUpon>SlideShowView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\AutoSelectTextboxView.xaml.cs">
-      <DependentUpon>AutoSelectTextboxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\MaskedTextboxView.xaml.cs">
-      <DependentUpon>MaskedTextboxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\MultiLineTextEditorView.xaml.cs">
-      <DependentUpon>MultiLineTextEditorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\RichTextboxView.xaml.cs">
-      <DependentUpon>RichTextboxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\WatermarkPasswordBoxView.xaml.cs">
-      <DependentUpon>WatermarkPasswordBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\WatermarkTextboxView.xaml.cs">
-      <DependentUpon>WatermarkTextboxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Theming\Converters\FlagPathConverter.cs" />
-    <Compile Include="Samples\Theming\Views\ThemingAvalonDockView.xaml.cs">
-      <DependentUpon>ThemingAvalonDockView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Theming\Views\ThemingCoreWPFView.xaml.cs">
-      <DependentUpon>ThemingCoreWPFView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Theming\Views\ThemingDataGridView.xaml.cs">
-      <DependentUpon>ThemingDataGridView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Theming\Views\ThemingExtendedToolkitView.xaml.cs">
-      <DependentUpon>ThemingExtendedToolkitView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Theming\Views\ThemingListBoxView.xaml.cs">
-      <DependentUpon>ThemingListBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\TimelinePanel\Views\TimelinePanelView.xaml.cs">
-      <DependentUpon>TimelinePanelView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\TimeSpan\Views\TimeSpanView.xaml.cs">
-      <DependentUpon>TimeSpanView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\ToggleSwitch\Views\ToggleSwitchView.xaml.cs">
-      <DependentUpon>ToggleSwitchView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\TokenizedTextBoxView.xaml.cs">
-      <DependentUpon>TokenizedTextBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml.cs">
-      <DependentUpon>WatermarkComboBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Window\Converters\IntToBoolConverter.cs" />
-    <Compile Include="Samples\Window\Converters\WindowStateToBoolConverter.cs" />
-    <Compile Include="Samples\Window\Resources\WindowModelEditor.xaml.cs">
-      <DependentUpon>WindowModelEditor.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Window\Views\ChildWindowView.xaml.cs">
-      <DependentUpon>ChildWindowView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Window\Views\StyleableWindowView.xaml.cs">
-      <DependentUpon>StyleableWindowView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Window\Views\WindowContainerView.xaml.cs">
-      <DependentUpon>WindowContainerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Wizard\Views\WizardView.xaml.cs">
-      <DependentUpon>WizardView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Zoombox\Converters\PointConverter.cs" />
-    <Compile Include="Samples\Zoombox\Converters\RectConverter.cs" />
-    <Compile Include="Samples\Zoombox\Converters\SimpleConverter.cs" />
-    <Compile Include="Samples\Zoombox\Converters\ViewFinderConverter.cs" />
-    <Compile Include="Samples\Zoombox\Converters\ViewNameConverter.cs" />
-    <Compile Include="Samples\Zoombox\Converters\ViewStackCountConverter.cs" />
-    <Compile Include="Samples\Zoombox\Views\ZoomboxView.xaml.cs">
-      <DependentUpon>ZoomboxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Service References\NorthwindDataService\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.datasvcmap</DependentUpon>
-    </Compile>
-    <Page Include="HomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\CodeFormatting\CSharpFormat.cs" />
-    <Compile Include="Core\CodeFormatting\XamlFormat.cs" />
-    <Compile Include="Core\LiveExplorerTreeViewItem.cs" />
-    <Compile Include="DemoView.cs" />
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Resources\LiveExplorerScrollViewer.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\TextBlockStyles.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\AvalonDock\Views\AvalonDockView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\BusyIndicator\Resources\Common.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Button\Views\IconButtonView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Button\Views\ButtonSpinnerView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Button\Views\DropDownSplitButtonView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Calculator\Views\CalculatorView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartAxisView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartLegendView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartSeriesBasicTypesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartStylingAxesGridView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartStylingColumnSeriesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartStylingLineSeriesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartStylingPieSeriesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\CheckLists\Views\CheckListsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Color\Views\ColorView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\DataGrid\Views\DataGridView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\DataGrid\Views\MultiColumnComboBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\DateTime\Views\DateTimeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\FilePicker\Views\FilePickerView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Gauge\Views\RadialGaugeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\ListBox\Views\ListBoxView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Magnifier\Views\MagnifierView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Resources\CommonResources.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialHamburgerView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialComboBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialListBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialToolTipView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialDropDownView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialSwitchView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialFrameView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialTabsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialProgressBarView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialRadioButtonView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialCheckBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialToastView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialSliderView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialTextFieldView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialButtonView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialControlsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MultiCalendar\Views\MultiCalendarView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Numeric\Views\NumericView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Panels\Views\SwitchPanelView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Pie\Views\PieChartView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Pie\Views\PieProgressView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Pie\Views\PieView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PileFlowPanel\Views\PileFlowPanelView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\RangeSlider\Views\RangeSliderView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Rating\Views\RatingView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\SlideShow\Views\SlideShowView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\AutoSelectTextboxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\MaskedTextboxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\MultiLineTextEditorView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\RichTextboxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\WatermarkPasswordBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\WatermarkTextboxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Theming\ItemTemplates\Common.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Theming\Views\ThemingAvalonDockView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Theming\Views\ThemingCoreWPFView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Theming\Views\ThemingDataGridView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Theming\Views\ThemingExtendedToolkitView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Theming\Views\ThemingListBoxView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\TimelinePanel\Views\TimelinePanelView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\TimeSpan\Views\TimeSpanView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\ToggleSwitch\Views\ToggleSwitchView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Text\Views\TokenizedTextBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Window\Resources\FancyStyles.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Window\Resources\WindowModelEditor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Window\Views\ChildWindowView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Window\Views\StyleableWindowView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Window\Views\WindowContainerView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Wizard\Views\WizardView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Zoombox\Views\ZoomboxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.fr.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>DisplayLocalizationRes.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="app.config" />
-    <None Include="Properties\app.manifest">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <AppDesigner Include="Properties\" />
-    <None Include="Service References\NorthwindDataService\service.edmx" />
-    <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 Include="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>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </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>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/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/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
deleted file mode 100644
index c6ea985d..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
deleted file mode 100644
index 3316fb13..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
deleted file mode 100644
index 0b2738c9..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
deleted file mode 100644
index cd17a9b2..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
deleted file mode 100644
index 141fbab9..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
deleted file mode 100644
index a61532db..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
deleted file mode 100644
index de6b0120..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
deleted file mode 100644
index b218170f..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 3515614b..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
deleted file mode 100644
index 98acb60e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
+++ /dev/null
@@ -1,227 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-                        <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>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
deleted file mode 100644
index 135a6e80..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
deleted file mode 100644
index b9d00996..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
deleted file mode 100644
index a9b30b08..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
deleted file mode 100644
index b71397d0..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
deleted file mode 100644
index 0a7aba23..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index ed8ad412..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
deleted file mode 100644
index 914e129c..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
deleted file mode 100644
index cf268030..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
deleted file mode 100644
index d24c8e08..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 6058039e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
deleted file mode 100644
index ad78aba3..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
deleted file mode 100644
index 8e7fd013..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 0160991c..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
deleted file mode 100644
index 3f3b0b28..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
deleted file mode 100644
index 40781ee5..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index cfc7a2a5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,218 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="ScrollViewer.PanningMode"
-            Value="Both" />
-    <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 RenderOptions.ClearTypeHint="Enabled">
-                      <Canvas HorizontalAlignment="Left"
-                              Height="0"
-                              VerticalAlignment="Top"
-                              Width="0">
-                        <Rectangle x:Name="OpaqueRect"
-                                   Fill="{Binding Background, ElementName=DropDownBorder}"
-                                   Height="{Binding ActualHeight, ElementName=DropDownBorder}"
-                                   Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
-                      </Canvas>
-                      <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/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
deleted file mode 100644
index 46000955..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
+++ /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
-
-  **********************************************************************************-->
-
-<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="ScrollViewer.PanningMode"
-            Value="Both" />
-    <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 RenderOptions.ClearTypeHint="Enabled">
-                      <Canvas HorizontalAlignment="Left"
-                              Height="0"
-                              VerticalAlignment="Top"
-                              Width="0">
-                        <Rectangle x:Name="OpaqueRect"
-                                   Fill="{Binding Background, ElementName=DropDownBorder}"
-                                   Height="{Binding ActualHeight, ElementName=DropDownBorder}"
-                                   Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
-                      </Canvas>
-                      <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/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
deleted file mode 100644
index 6b97c457..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 4d03d107..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
deleted file mode 100644
index bd3d6c91..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
deleted file mode 100644
index ad27f8ba..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
deleted file mode 100644
index 690c9232..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
deleted file mode 100644
index 07209708..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 2a5bd5ef..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
deleted file mode 100644
index 7256260d..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
deleted file mode 100644
index 89c66d09..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index d1f499f6..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
deleted file mode 100644
index 2ee81a1a..00000000
--- a/ExtendedWPFToolkitSolution/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/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 db766804..00000000
--- a/ExtendedWPFToolkitSolution/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/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.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
deleted file mode 100644
index 8ad8ec1e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
deleted file mode 100644
index 8d61bcbb..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 4047e312..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
deleted file mode 100644
index 2c9d81f4..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
deleted file mode 100644
index 883ef47e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
deleted file mode 100644
index 23c0a469..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
deleted file mode 100644
index 370263a6..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
deleted file mode 100644
index 30fa8ec5..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index ca5926c0..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
deleted file mode 100644
index aa31e288..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
deleted file mode 100644
index d58c61e5..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
deleted file mode 100644
index dcd4f140..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
deleted file mode 100644
index cda549e1..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
deleted file mode 100644
index 5d8ff375..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
deleted file mode 100644
index e1711fe9..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
deleted file mode 100644
index b40f1574..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
deleted file mode 100644
index dced284a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
deleted file mode 100644
index efe72b02..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
deleted file mode 100644
index 1eb772bc..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
deleted file mode 100644
index 390da4cd..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
deleted file mode 100644
index 8a906ad9..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
deleted file mode 100644
index 56a6d0c2..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
deleted file mode 100644
index 75650e12..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
deleted file mode 100644
index d059569e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
deleted file mode 100644
index ed3c07f8..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
deleted file mode 100644
index 86cc37b8..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
deleted file mode 100644
index fdcefa48..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
deleted file mode 100644
index f78807d0..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
deleted file mode 100644
index e535f3b0..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
deleted file mode 100644
index e09d4cff..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
deleted file mode 100644
index 1135f2f3..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
deleted file mode 100644
index bfec6ea8..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
deleted file mode 100644
index ae3aaceb..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
deleted file mode 100644
index c44e86f9..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx
deleted file mode 100644
index 8addfd76..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
deleted file mode 100644
index 7c376726..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
deleted file mode 100644
index 9a81349f..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
deleted file mode 100644
index 83d0562a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
deleted file mode 100644
index bc7c6151..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
deleted file mode 100644
index 0e82cf02..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
deleted file mode 100644
index e1c47a14..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
deleted file mode 100644
index cec587da..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
deleted file mode 100644
index 793cb9e1..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
deleted file mode 100644
index 97fc54bf..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
deleted file mode 100644
index 1d67d3fd..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
deleted file mode 100644
index 3ec7e7ba..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
deleted file mode 100644
index c8b9024f..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
deleted file mode 100644
index 1cc8fcb1..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
deleted file mode 100644
index dbb3d684..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
deleted file mode 100644
index 57f56b0e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
deleted file mode 100644
index 41c3a77a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
deleted file mode 100644
index 4b7765a6..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
deleted file mode 100644
index 7a3f193e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
deleted file mode 100644
index af191752..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
deleted file mode 100644
index f05278e7..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
deleted file mode 100644
index 9a5459f7..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
deleted file mode 100644
index b4c8ea12..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
deleted file mode 100644
index 22eed4df..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
deleted file mode 100644
index 05be50dc..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
deleted file mode 100644
index 48ef9fc9..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
deleted file mode 100644
index c00f05bb..00000000
--- a/ExtendedWPFToolkitSolution/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/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
deleted file mode 100644
index 7749a5ea..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
deleted file mode 100644
index f77c43bc..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
deleted file mode 100644
index 2a6c88cc..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
deleted file mode 100644
index 89ff8d8d..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
deleted file mode 100644
index de0e4f27..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
deleted file mode 100644
index 9ab3ee99..00000000
--- a/ExtendedWPFToolkitSolution/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/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
deleted file mode 100644
index 613a3f09..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
deleted file mode 100644
index 510b47c0..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
deleted file mode 100644
index 028ad56a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
deleted file mode 100644
index e4b4aa8c..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
deleted file mode 100644
index 2b80831c..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
deleted file mode 100644
index 7467beb3..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
deleted file mode 100644
index bf01e59e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
deleted file mode 100644
index 28a1720e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
deleted file mode 100644
index 0c67b3ba..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
deleted file mode 100644
index b29d30d0..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
deleted file mode 100644
index 90f32750..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
deleted file mode 100644
index 580cd09b..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
deleted file mode 100644
index 0ae57913..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
deleted file mode 100644
index c07e4186..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
deleted file mode 100644
index 169a40a1..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 55615261..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,277 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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/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"
-                                 RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
-                                 RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
-                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                 RenderPressed="{TemplateBinding IsPressed}">
-
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter HorizontalAlignment="Stretch"
-                                  VerticalAlignment="Stretch"
-                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="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>
-
-
-  <!-- =============================================================================== -->
-  <!-- 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>
-                    <Calendar x:Name="PART_Calendar"
-                              BorderThickness="0"
-                              DisplayMode="{Binding CalendarDisplayMode, RelativeSource={RelativeSource TemplatedParent}}">
-                      <Calendar.Template>
-                        <ControlTemplate TargetType="{x:Type Calendar}">
-                          <Viewbox Width="{Binding CalendarWidth, RelativeSource={RelativeSource AncestorType={x:Type local:DateTimePicker}}}">
-                            <StackPanel x:Name="PART_Root"
-                                        HorizontalAlignment="Center">
-                              <CalendarItem x:Name="PART_CalendarItem"
-                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                            Background="{TemplateBinding Background}"
-                                            Style="{TemplateBinding CalendarItemStyle}" />
-                            </StackPanel>
-                          </Viewbox>
-                        </ControlTemplate>
-                      </Calendar.Template>
-                    </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/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
deleted file mode 100644
index 79d3a60e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
+++ /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
-
-  **********************************************************************************-->
-
-<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" />
-  <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"
-                                 RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
-                                 RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
-                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                 RenderPressed="{TemplateBinding IsPressed}">
-
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter HorizontalAlignment="Stretch"
-                                  VerticalAlignment="Stretch"
-                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="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>
-
-  <!-- =============================================================================== -->
-  <!-- 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>
-                    <Calendar x:Name="PART_Calendar"
-                              BorderThickness="0"
-                              DisplayMode="{Binding CalendarDisplayMode, RelativeSource={RelativeSource TemplatedParent}}">
-                      <Calendar.Template>
-                        <ControlTemplate TargetType="{x:Type Calendar}">
-                          <Viewbox Width="{Binding CalendarWidth, RelativeSource={RelativeSource AncestorType={x:Type local:DateTimePicker}}}">
-                            <StackPanel x:Name="PART_Root"
-                                        HorizontalAlignment="Center">
-                              <CalendarItem x:Name="PART_CalendarItem"
-                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                            Background="{TemplateBinding Background}"
-                                            Style="{TemplateBinding CalendarItemStyle}" />
-                            </StackPanel>
-                          </Viewbox>
-                        </ControlTemplate>
-                      </Calendar.Template>
-                    </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/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
deleted file mode 100644
index b5bba325..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
deleted file mode 100644
index 9f17e145..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
deleted file mode 100644
index 60cf05cc..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
deleted file mode 100644
index bc3b660e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
deleted file mode 100644
index 344516f9..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index e60fb629..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
deleted file mode 100644
index bae925ff..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
deleted file mode 100644
index 11b77e7a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index f7faa69a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
deleted file mode 100644
index a54bfbf6..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
deleted file mode 100644
index 9f08c400..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 6edb1d07..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
deleted file mode 100644
index 6edb1d07..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
deleted file mode 100644
index d752ad10..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
deleted file mode 100644
index cd1bfa2c..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
deleted file mode 100644
index 7e1f8d78..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
deleted file mode 100644
index b0ef685c..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
deleted file mode 100644
index 88856103..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
deleted file mode 100644
index 5bad5932..00000000
--- a/ExtendedWPFToolkitSolution/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/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/Images/Notes16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png
deleted file mode 100644
index ebfaee36..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
deleted file mode 100644
index 39780891..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 2fbc03ae..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
deleted file mode 100644
index 378ade61..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
deleted file mode 100644
index 5eb4628f..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
deleted file mode 100644
index f18b2847..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
deleted file mode 100644
index d197c875..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
deleted file mode 100644
index 7806ce2a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
deleted file mode 100644
index 8b6e4b85..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
deleted file mode 100644
index 8ba2d64b..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
deleted file mode 100644
index e76846ad..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
deleted file mode 100644
index 0d9e0de5..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
deleted file mode 100644
index f15e28cf..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
deleted file mode 100644
index 39ecc075..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
deleted file mode 100644
index 462a880c..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
deleted file mode 100644
index c2ecc707..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
deleted file mode 100644
index 185050cb..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
deleted file mode 100644
index c3992441..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index b2e8549f..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
deleted file mode 100644
index cebeb172..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
deleted file mode 100644
index b118f7fb..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
deleted file mode 100644
index dcc130ef..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
deleted file mode 100644
index 538628fe..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
deleted file mode 100644
index 3d051719..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
deleted file mode 100644
index a89d5edf..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
deleted file mode 100644
index ab5f4e85..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
deleted file mode 100644
index 66d4acac..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
deleted file mode 100644
index d0fb56c1..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
deleted file mode 100644
index a1dd43b0..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
deleted file mode 100644
index 64faa9e4..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
deleted file mode 100644
index 7d7d53b7..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
deleted file mode 100644
index e0410522..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
deleted file mode 100644
index 4a6af9b2..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
deleted file mode 100644
index 1d079e2a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
deleted file mode 100644
index 3217f008..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
deleted file mode 100644
index 7a023c23..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
deleted file mode 100644
index 523041aa..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
deleted file mode 100644
index c5a05da1..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
deleted file mode 100644
index b4585aa7..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
deleted file mode 100644
index 01c66fe2..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
deleted file mode 100644
index d99909ab..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
deleted file mode 100644
index 499ebdde..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
deleted file mode 100644
index 583e4ab5..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index cd89a90b..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
deleted file mode 100644
index 65b64557..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
deleted file mode 100644
index d72aaa87..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
deleted file mode 100644
index 7e5a907a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
deleted file mode 100644
index 5c98eac3..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
deleted file mode 100644
index e65f57fb..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
deleted file mode 100644
index 8243acff..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
deleted file mode 100644
index 1e122a0c..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
deleted file mode 100644
index fe383baf..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
deleted file mode 100644
index 9f38410a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
deleted file mode 100644
index 78355b2e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
deleted file mode 100644
index 85c0ced8..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
deleted file mode 100644
index ccddcb5e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
deleted file mode 100644
index ecfdaddf..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
deleted file mode 100644
index eaf040a4..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
deleted file mode 100644
index 970e66e3..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
deleted file mode 100644
index cb7bd023..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
deleted file mode 100644
index 5fa821af..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
deleted file mode 100644
index ac2430fc..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
deleted file mode 100644
index 46cb091b..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
deleted file mode 100644
index ee4ad3b4..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
deleted file mode 100644
index cd0553b0..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
deleted file mode 100644
index e2c7d4b1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.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
-
-  ***********************************************************************************/
-
-#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;
-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
-
-
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
deleted file mode 100644
index a36deced..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
deleted file mode 100644
index 40528354..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index f4890a1f..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
deleted file mode 100644
index 95a47482..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
deleted file mode 100644
index ddbdfd46..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
deleted file mode 100644
index bb6d1ff3..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
deleted file mode 100644
index aaca7b13..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
deleted file mode 100644
index 30ed667a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
deleted file mode 100644
index 7bd70583..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
deleted file mode 100644
index e8852f65..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png
deleted file mode 100644
index 8fb36a1a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png
deleted file mode 100644
index 73e7c15e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png
deleted file mode 100644
index 1030a021..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png
deleted file mode 100644
index d9207308..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png
deleted file mode 100644
index 8259a9e1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png
deleted file mode 100644
index c5499bce..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png
deleted file mode 100644
index 51dffb73..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png
deleted file mode 100644
index 03f6fde2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png
deleted file mode 100644
index cb8e400a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png
deleted file mode 100644
index 4a3783f2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png
deleted file mode 100644
index 72689482..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
deleted file mode 100644
index 53b19dfa..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
deleted file mode 100644
index 1b3c53d9..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 8a6a8f75..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
deleted file mode 100644
index 1457bb50..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
deleted file mode 100644
index 709437b9..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index e541166f..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
deleted file mode 100644
index 7791fcf0..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
deleted file mode 100644
index a452b362..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
deleted file mode 100644
index bee48674..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
deleted file mode 100644
index 61e2a4a9..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
deleted file mode 100644
index 124da4c7..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index e9ff8926..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
deleted file mode 100644
index a0531d31..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
deleted file mode 100644
index ec195aa7..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
deleted file mode 100644
index 0d24459a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
deleted file mode 100644
index 1f8f2b00..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
deleted file mode 100644
index 0477349a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
deleted file mode 100644
index 07fe1414..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
deleted file mode 100644
index f236d736..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
deleted file mode 100644
index d0c654f7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
+++ /dev/null
@@ -1,234 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="Images/resize_grip.png" />
-
-   <Style x:Key="buttonImageStyle" TargetType="Image">
-      <Setter Property="Stretch" Value="None" />
-      <Setter Property="UseLayoutRounding" Value="True" />
-      <Setter Property="RenderOptions.EdgeMode" Value="Aliased" />
-      <Setter Property="RenderOptions.BitmapScalingMode" Value="NearestNeighbor" />
-   </Style>
-
-    <!-- Minimize -->
-   <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/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
deleted file mode 100644
index 166236e8..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png
deleted file mode 100644
index 3fe5c919..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png
deleted file mode 100644
index 1b461928..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png
deleted file mode 100644
index d7fcb801..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png
deleted file mode 100644
index e406e334..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png
deleted file mode 100644
index a8ef093a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png
deleted file mode 100644
index fac35369..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png
deleted file mode 100644
index 7d8fede6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png
deleted file mode 100644
index 0ee5dfbd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png
deleted file mode 100644
index 9a2987ec..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png
deleted file mode 100644
index 4f977353..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png
deleted file mode 100644
index bf066962..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png
deleted file mode 100644
index 1c3d9a5e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png
deleted file mode 100644
index d9805399..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png
deleted file mode 100644
index 4715f7d6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png
deleted file mode 100644
index 3755d81a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png
deleted file mode 100644
index 713a1a2f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png
deleted file mode 100644
index ec5d431b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png
deleted file mode 100644
index c4c0496c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png
deleted file mode 100644
index 204ea5cc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png
deleted file mode 100644
index 64870392..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png
deleted file mode 100644
index 3ab1ec5e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png
deleted file mode 100644
index 8a085971..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png
deleted file mode 100644
index 1683f61d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png
deleted file mode 100644
index 9f1a27e5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png
deleted file mode 100644
index da3f7787..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png
deleted file mode 100644
index 595eb1fe..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png
deleted file mode 100644
index c94c7016..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
deleted file mode 100644
index 6d617a30..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
deleted file mode 100644
index b7baac60..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
deleted file mode 100644
index 41532b30..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index cd7141c6..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
deleted file mode 100644
index 63daafc1..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
deleted file mode 100644
index 49629d6f..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 5581bb6e..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
deleted file mode 100644
index fe271781..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
deleted file mode 100644
index 74307d71..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
deleted file mode 100644
index f2f56c57..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
deleted file mode 100644
index 3070064a..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/VisualStates.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs
deleted file mode 100644
index 145e2092..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
deleted file mode 100644
index 0a61abfe..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index f0f4b933..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
deleted file mode 100644
index f0f4b933..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
deleted file mode 100644
index 79249aad..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
deleted file mode 100644
index 58483022..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index a486bcc9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
+++ /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
-
-  **********************************************************************************-->
-
-<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="ScrollViewer.PanningMode"
-            Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled"
-            Value="False" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
-          <Grid>
-
-            <Border x:Name="Border"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    CornerRadius="0"
-                    Background="{TemplateBinding Background}">
-              <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/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
deleted file mode 100644
index 844f74f7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/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
-
-  **********************************************************************************-->
-
-<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="ScrollViewer.PanningMode"
-            Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled"
-            Value="False" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
-          <Grid>
-
-            <Border x:Name="Border"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    CornerRadius="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/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
deleted file mode 100644
index 6daa0ed2..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
deleted file mode 100644
index 06931d6f..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
deleted file mode 100644
index 635e683d..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
deleted file mode 100644
index 6351252f..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
deleted file mode 100644
index 0a9d7668..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index dbfd0a11..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
deleted file mode 100644
index fa4a8fa6..00000000
--- a/ExtendedWPFToolkitSolution/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/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
deleted file mode 100644
index 80392333..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
+++ /dev/null
@@ -1,798 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{72E591D6-8F83-4D8C-8F67-9C325E623234}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xceed.Wpf.Toolkit</RootNamespace>
-    <AssemblyName>Xceed.Wpf.Toolkit</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="UIAutomationProvider" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="BusyIndicator\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="BusyIndicator\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="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" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/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/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
deleted file mode 100644
index 4a6b2f46..00000000
--- a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
+++ /dev/null
@@ -1,64 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit.LiveExplorer", "Src\Xceed.Wpf.Toolkit.LiveExplorer\Xceed.Wpf.Toolkit.LiveExplorer.csproj", "{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.DataGrid", "Src\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj", "{63648392-6CE9-4A60-96D4-F9FD718D29B0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.VS2010", "Src\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.Metro", "Src\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.Aero", "Src\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Release|Mixed Platforms.Build.0 = Release|x86
-		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21} = {8976E4A6-FF5F-44C5-AC57-FEDA249DD199}
-		{89286EB4-B4A1-418C-839A-067B00F442D8} = {8976E4A6-FF5F-44C5-AC57-FEDA249DD199}
-		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B} = {8976E4A6-FF5F-44C5-AC57-FEDA249DD199}
-	EndGlobalSection
-EndGlobal