diff --git a/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.ToolKit.Full.nuspec b/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.ToolKit.Full.nuspec
new file mode 100644
index 00000000..e8212df6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.ToolKit.Full.nuspec
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+	<metadata>
+		<id>APD.Wpf.Xceed.ToolKit.Full</id>
+		<version>0.0.0.0</version>
+		<title>APD Xceed ToolKit Full</title>
+		<description>Our fork of Xceed's ToolKit. Contain the full Xceed Wpf Tookit - Including avalon dock.</description>
+		<authors>Xceed, APD Communications</authors>
+		<copyright>Xceed &amp; APD Communications</copyright>
+	</metadata>
+	<files>
+		<file src="Src\Xceed.Wpf.AvalonDock\bin\Release\**" target="lib\net40" />
+		<file src="Src\Xceed.Wpf.Toolkit\bin\Release\**" target="lib\net40" />
+		<file src="Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\**" target="lib\net40" />
+		<file src="Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\**" target="lib\net40" />
+		<file src="Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\**" target="lib\net40" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs
index c6ea985d..2c57bb8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs
@@ -21,7 +21,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "3.4";
+  public const string BaseVersion = "3.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
index 0bbf9bac..051479d8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
@@ -578,7 +578,8 @@
 
   <ControlTemplate x:Key="AvalonDock_ThemeAero_AnchorSideTemplate"
                    TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
-    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}"
+                  Background="{TemplateBinding Background}">
       <ItemsControl.ItemsPanel>
         <ItemsPanelTemplate>
           <StackPanel MinWidth="4"
@@ -1095,15 +1096,19 @@
                                 Grid.Row="1" />
               <ContentPresenter Content="{TemplateBinding RightSidePanel}"
                                 Grid.Column="2"
-                                Grid.Row="1" />
+                                Grid.Row="0"
+                                Grid.RowSpan="3" />
               <ContentPresenter Content="{TemplateBinding LeftSidePanel}"
                                 Grid.Column="0"
-                                Grid.Row="1" />
+                                Grid.Row="0"
+                                Grid.RowSpan="3" />
               <ContentPresenter Content="{TemplateBinding TopSidePanel}"
-                                Grid.Column="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="3"
                                 Grid.Row="0" />
               <ContentPresenter Content="{TemplateBinding BottomSidePanel}"
-                                Grid.Column="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="3"
                                 Grid.Row="2" />
               <ContentPresenter x:Name="PART_AutoHideArea"
                                 Content="{TemplateBinding AutoHideWindow}"
@@ -1139,7 +1144,7 @@
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}">
-            <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
+            <ContentPresenter Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}"
                               ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
                               ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
           </Border>
@@ -1268,7 +1273,7 @@
               </Border>
               <ContentPresenter Grid.Row="1"
                                 FlowDirection="{TemplateBinding FlowDirection}"
-                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
+                                Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}" />
 
               <!--<ContentPresenter 
                                 Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Brushes.baml
deleted file mode 100644
index f2fc70fd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index c65238fb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.i.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.i.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Theme.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Theme.baml
deleted file mode 100644
index 7558b5b0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Theme.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.csproj.FileListAbsolute.txt
deleted file mode 100644
index 38d68938..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Brushes.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Theme.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.g.resources
deleted file mode 100644
index 9216728b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
deleted file mode 100644
index 556f4e24..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
+++ /dev/null
@@ -1,5 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Theme.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs
index c6ea985d..2c57bb8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs
@@ -21,7 +21,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "3.4";
+  public const string BaseVersion = "3.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
index 1027b5d7..dfc0e3b0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
@@ -456,6 +456,8 @@
   </Style>
 
   <Style TargetType="avalonDockControls:AnchorablePaneTitle">
+    <Setter Property="BorderThickness"
+            Value="0,3,0,0"/>
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate>
@@ -547,8 +549,6 @@
                          Value="True">
               <Setter Property="BorderBrush"
                       Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
-              <Setter Property="BorderThickness"
-                      Value="0,3,0,0" />
             </DataTrigger>
             <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}"
                          Value="True">
@@ -598,7 +598,8 @@
 
   <ControlTemplate x:Key="AvalonDock_ThemeMetro_AnchorSideTemplate"
                    TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
-    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}"
+                  Background="{TemplateBinding Background}">
       <ItemsControl.ItemsPanel>
         <ItemsPanelTemplate>
           <StackPanel MinWidth="4"
@@ -1117,15 +1118,19 @@
                                 Grid.Row="1" />
               <ContentPresenter Content="{TemplateBinding RightSidePanel}"
                                 Grid.Column="2"
-                                Grid.Row="1" />
+                                Grid.Row="0"
+                                Grid.RowSpan="3" />
               <ContentPresenter Content="{TemplateBinding LeftSidePanel}"
                                 Grid.Column="0"
-                                Grid.Row="1" />
+                                Grid.Row="0"
+                                Grid.RowSpan="3"/>
               <ContentPresenter Content="{TemplateBinding TopSidePanel}"
-                                Grid.Column="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="3"
                                 Grid.Row="0" />
               <ContentPresenter Content="{TemplateBinding BottomSidePanel}"
-                                Grid.Column="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="3"
                                 Grid.Row="2" />
               <ContentPresenter x:Name="PART_AutoHideArea"
                                 Content="{TemplateBinding AutoHideWindow}"
@@ -1162,7 +1167,7 @@
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}">
-            <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
+            <ContentPresenter Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}"
                               ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
                               ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
           </Border>
@@ -1311,7 +1316,7 @@
               </Border>
               <ContentPresenter Grid.Row="1"
                                 FlowDirection="{TemplateBinding FlowDirection}"
-                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
+                                Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}" />
 
               <!--<ContentPresenter 
                                 Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
@@ -1558,7 +1563,7 @@
                 <Border x:Name="Header"
                         Padding="2,0,2,0"
                         TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
-                        Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}">
+                        Background="{TemplateBinding Background}">
                   <Grid>
                     <Grid.ColumnDefinitions>
                       <ColumnDefinition Width="*" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Brushes.baml
deleted file mode 100644
index f9a94fe5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Theme.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Theme.baml
deleted file mode 100644
index 7c3c5841..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Theme.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.csproj.FileListAbsolute.txt
deleted file mode 100644
index 0c30339b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Brushes.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Theme.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.g.resources
deleted file mode 100644
index 9f250192..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
deleted file mode 100644
index a99d42b4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\Theme.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs
index c6ea985d..2c57bb8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs
@@ -21,7 +21,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "3.4";
+  public const string BaseVersion = "3.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
index d7d484db..7c6a6613 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
@@ -686,7 +686,8 @@
 
   <ControlTemplate x:Key="AvalonDock_ThemeVS2010_AnchorSideTemplate"
                    TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
-    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}"
+                  Background="{TemplateBinding Background}">
       <ItemsControl.ItemsPanel>
         <ItemsPanelTemplate>
           <StackPanel MinWidth="4"
@@ -1212,15 +1213,19 @@
                                 Grid.Row="1" />
               <ContentPresenter Content="{TemplateBinding RightSidePanel}"
                                 Grid.Column="2"
-                                Grid.Row="1" />
+                                Grid.Row="0"
+                                Grid.RowSpan="3" />
               <ContentPresenter Content="{TemplateBinding LeftSidePanel}"
                                 Grid.Column="0"
-                                Grid.Row="1" />
+                                Grid.Row="0"
+                                Grid.RowSpan="3" />
               <ContentPresenter Content="{TemplateBinding TopSidePanel}"
-                                Grid.Column="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="3"
                                 Grid.Row="0" />
               <ContentPresenter Content="{TemplateBinding BottomSidePanel}"
-                                Grid.Column="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="3"
                                 Grid.Row="2" />
               <ContentPresenter x:Name="PART_AutoHideArea"
                                 Content="{TemplateBinding AutoHideWindow}"
@@ -1256,7 +1261,7 @@
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}">
-            <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
+            <ContentPresenter Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}"
                               ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
                               ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
           </Border>
@@ -1407,7 +1412,7 @@
               </Border>
               <ContentPresenter Grid.Row="1"
                                 FlowDirection="{TemplateBinding FlowDirection}"
-                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
+                                Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}" />
 
               <!--<ContentPresenter 
                                 Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Brushes.baml
deleted file mode 100644
index 140e78f6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Theme.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Theme.baml
deleted file mode 100644
index c7159e9f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Theme.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj.FileListAbsolute.txt
deleted file mode 100644
index 1b504512..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Brushes.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Theme.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources
deleted file mode 100644
index 91044a8c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
deleted file mode 100644
index 5885ecd8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\Theme.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
index c6ea985d..2c57bb8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
@@ -21,7 +21,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "3.4";
+  public const string BaseVersion = "3.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs
index 9c5a327d..7110c2b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs
@@ -155,6 +155,22 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
           manager.StartDraggingFloatingWindowForPane( paneModel );
         }
+        else
+        {
+          var model = this.Model;
+          if( model != null )
+          {
+            var root = model.Root;
+            if( root != null )
+            {
+              var manager = root.Manager;
+              if( manager != null )
+              {
+                manager.StartDraggingFloatingWindowForContent( model );
+              }
+            }
+          }
+        }
       }
 
       _isMouseDown = false;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
index 152cd5e9..e3488b9c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
@@ -45,8 +45,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
       DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutAnchorableFloatingWindowControl ), new FrameworkPropertyMetadata( typeof( LayoutAnchorableFloatingWindowControl ) ) );
     }
 
-    internal LayoutAnchorableFloatingWindowControl( LayoutAnchorableFloatingWindow model )
-        : base( model )
+    internal LayoutAnchorableFloatingWindowControl( LayoutAnchorableFloatingWindow model, bool isContentImmutable )
+       : base( model, isContentImmutable )
     {
       _model = model;
       HideWindowCommand = new RelayCommand( ( p ) => OnExecuteHideWindowCommand( p ), ( p ) => CanExecuteHideWindowCommand( p ) );
@@ -54,6 +54,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
       UpdateThemeResources();
     }
 
+    internal LayoutAnchorableFloatingWindowControl( LayoutAnchorableFloatingWindow model)
+        : base( model, false )
+    {
+    }
+
     #endregion
 
     #region Properties
@@ -139,8 +144,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
     protected override void OnClosed( EventArgs e )
     {
       var root = Model.Root;
-      root.Manager.RemoveFloatingWindow( this );
-      root.CollectGarbage();
+      if( root != null )
+      {
+        root.Manager.RemoveFloatingWindow( this );
+        root.CollectGarbage();
+      }
       if( _overlayWindow != null )
       {
         _overlayWindow.Close();
@@ -149,7 +157,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
       base.OnClosed( e );
 
-      if( !CloseInitiatedByUser )
+      if( !CloseInitiatedByUser && (root != null) )
       {
         root.FloatingWindows.Remove( _model );
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs
index ef1895fd..6ea9f202 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs
@@ -299,6 +299,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
       base.Detach();
     }
 
+    protected override bool CanExecuteDockAsDocumentCommand()
+    {
+      var canExecute = base.CanExecuteDockAsDocumentCommand();
+      if( canExecute && ( _anchorable != null ) )
+        return _anchorable.CanDockAsTabbedDocument;
+
+      return canExecute;
+    }
+
     protected override void Close()
     {
       if( ( _anchorable.Root != null ) && ( _anchorable.Root.Manager != null ) )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
index 3c725619..48310de9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
@@ -68,10 +68,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     protected override void OnGotKeyboardFocus( System.Windows.Input.KeyboardFocusChangedEventArgs e )
     {
-      if( ( _model != null ) && ( _model.SelectedContent != null ) )
-      {
-        _model.SelectedContent.IsActive = true;
-      }
+      _model.SelectedContent.IsActive = true;
 
       base.OnGotKeyboardFocus( e );
     }
@@ -80,20 +77,17 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       base.OnMouseLeftButtonDown( e );
 
-      if( !e.Handled && ( _model != null ) && ( _model.SelectedContent != null ) )
-      {
+      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 != null ) && ( _model.SelectedContent != null ) )
-      {
+      if( !e.Handled && _model.SelectedContent != null )
         _model.SelectedContent.IsActive = true;
-      }
+
     }
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
index 743e0265..cfc75130 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
@@ -28,7 +28,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     private bool _isMouseDown = false;
     private static LayoutAnchorableTabItem _draggingItem = null;
-    private static bool _cancelMouseLeave = false;
 
     #endregion
 
@@ -147,10 +146,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
         _isMouseDown = false;
         _draggingItem = null;
       }
-      else
-      {
-        _cancelMouseLeave = false;
-      }
     }
 
     protected override void OnMouseLeftButtonUp( System.Windows.Input.MouseButtonEventArgs e )
@@ -168,21 +163,19 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
       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;
+        _draggingItem = this;
       }
 
       _isMouseDown = false;
-      _cancelMouseLeave = false;
     }
 
     protected override void OnMouseEnter( MouseEventArgs e )
     {
       base.OnMouseEnter( e );
 
-      if( _draggingItem != this &&
-          e.LeftButton == MouseButtonState.Pressed )
+      if( _draggingItem != null
+          && _draggingItem != this
+          && e.LeftButton == MouseButtonState.Pressed )
       {
         var model = Model;
         var container = model.Parent as ILayoutContainer;
@@ -221,11 +214,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       _draggingItem = null;
     }
-    internal static void CancelMouseLeave()
-    {
-      _cancelMouseLeave = true;
-    }
 
-  #endregion
-}
+    #endregion
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
index 1853246d..d1cbf1cc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
@@ -195,11 +195,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
       }
     }
 
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-    }
-
     protected override bool HasFocusWithinCore()
     {
       return false;
@@ -254,6 +249,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       Visibility = System.Windows.Visibility.Visible;
       InvalidateMeasure();
       UpdateWindowPos();
+      Win32Helper.BringWindowToTop( _internalHwndSource.Handle );
     }
 
     internal void Hide()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
index 77a2f258..32b49f2b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
@@ -37,13 +37,18 @@ namespace Xceed.Wpf.AvalonDock.Controls
       DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutDocumentFloatingWindowControl ), new FrameworkPropertyMetadata( typeof( LayoutDocumentFloatingWindowControl ) ) );
     }
 
-    internal LayoutDocumentFloatingWindowControl( LayoutDocumentFloatingWindow model )
-        : base( model )
+    internal LayoutDocumentFloatingWindowControl( LayoutDocumentFloatingWindow model, bool isContentImmutable )
+       : base( model, isContentImmutable )
     {
       _model = model;
       UpdateThemeResources();
     }
 
+    internal LayoutDocumentFloatingWindowControl( LayoutDocumentFloatingWindow model )
+        : base( model, false )
+    {
+    }
+
     #endregion
 
     #region Properties
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs
index 8c9aca9b..0f244e24 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs
@@ -143,6 +143,10 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
       Model.IsActive = true;
 
+      var layoutDocument = Model as LayoutDocument;
+      if( ( layoutDocument != null ) && !layoutDocument.CanMove )
+        return;
+
       if( e.ClickCount == 1 )
       {
         _mouseDownPoint = e.GetPosition( this );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
index bb5dcf3c..58348800 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
@@ -41,6 +41,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     private HwndSourceHook _hwndSrcHook;
     private DragService _dragService = null;
     private bool _internalCloseFlag = false;
+    private bool _isClosing = false;
 
     #endregion
 
@@ -60,6 +61,12 @@ namespace Xceed.Wpf.AvalonDock.Controls
       _model = model;
     }
 
+    protected LayoutFloatingWindowControl( ILayoutElement model, bool isContentImmutable )
+      : this( model )
+    {
+      this.IsContentImmutable = isContentImmutable;
+    }
+
     #endregion
 
     #region Properties
@@ -73,6 +80,32 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     #endregion
 
+    #region IsContentImmutable
+
+    /// <summary>
+    /// IsContentImmutable Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty IsContentImmutableProperty = DependencyProperty.Register( "IsContentImmutable", typeof( bool ), typeof( LayoutFloatingWindowControl ),
+              new FrameworkPropertyMetadata( (bool)false ) );
+
+    /// <summary>
+    /// Gets/sets the IsContentImmutable property.  This dependency property 
+    /// indicates if the content can be modified.
+    /// </summary>
+    public bool IsContentImmutable
+    {
+      get
+      {
+        return (bool)GetValue( IsContentImmutableProperty );
+      }
+      private set
+      {
+        SetValue( IsContentImmutableProperty, value );
+      }
+    }
+
+    #endregion
+
     #region IsDragging
 
     /// <summary>
@@ -305,7 +338,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       switch( msg )
       {
         case Win32Helper.WM_ACTIVATE:
-          if( ( ( int )wParam & 0xFFFF ) == Win32Helper.WA_INACTIVE )
+          if( ( (int)wParam & 0xFFFF ) == Win32Helper.WA_INACTIVE )
           {
             if( lParam == this.GetParentWindowHandle() )
             {
@@ -348,7 +381,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
         case Win32Helper.WM_SYSCOMMAND:
-          int command = ( int )wParam & 0xFFF0;
+          int command = (int)wParam & 0xFFF0;
           if( command == Win32Helper.SC_MAXIMIZE || command == Win32Helper.SC_RESTORE )
           {
             UpdateMaximizedState( command == Win32Helper.SC_MAXIMIZE );
@@ -364,7 +397,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
     internal void InternalClose()
     {
       _internalCloseFlag = true;
-      Close();
+      if( !_isClosing )
+      {
+        _isClosing = true;
+        this.Close();
+      }
     }
 
     #endregion
@@ -373,7 +410,14 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     private static object CoerceContentValue( DependencyObject sender, object content )
     {
-      return new FloatingWindowContentHost( sender as LayoutFloatingWindowControl ) { Content = content as UIElement };
+      var lfwc = sender as LayoutFloatingWindowControl;
+      if( lfwc != null )
+      {
+        if( lfwc.IsLoaded && lfwc.IsContentImmutable )
+          return lfwc.Content;
+        return new FloatingWindowContentHost( sender as LayoutFloatingWindowControl ) { Content = content as UIElement };
+      }
+      return null;
     }
 
     private void OnLoaded( object sender, RoutedEventArgs e )
@@ -478,6 +522,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         _owner = owner;
         var manager = _owner.Model.Root.Manager;
+
+        var binding = new Binding( "SizeToContent" ) { Source = _owner };
+        BindingOperations.SetBinding( this, FloatingWindowContentHost.SizeToContentProperty, binding );
       }
 
       #endregion
@@ -525,16 +572,72 @@ namespace Xceed.Wpf.AvalonDock.Controls
       /// </summary>
       private static void OnContentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
       {
-        ( ( FloatingWindowContentHost )d ).OnContentChanged( e );
+        ( ( FloatingWindowContentHost )d ).OnContentChanged( (UIElement)e.OldValue, (UIElement)e.NewValue );
       }
 
       /// <summary>
       /// Provides derived classes an opportunity to handle changes to the Content property.
       /// </summary>
-      protected virtual void OnContentChanged( DependencyPropertyChangedEventArgs e )
+      protected virtual void OnContentChanged( UIElement oldValue, UIElement newValue )
       {
         if( _rootPresenter != null )
           _rootPresenter.Child = Content;
+
+        var oldContent = oldValue as FrameworkElement;
+        if( oldContent != null )
+        {
+          oldContent.SizeChanged -= this.Content_SizeChanged;
+        }
+
+        var newContent = newValue as FrameworkElement;
+        if( newContent != null )
+        {
+          newContent.SizeChanged += this.Content_SizeChanged;
+        }
+      }
+
+      #endregion
+
+      #region SizeToContent
+
+      /// <summary>
+      /// SizeToContent Dependency Property
+      /// </summary>
+      public static readonly DependencyProperty SizeToContentProperty = DependencyProperty.Register( "SizeToContent", typeof( SizeToContent ), typeof( FloatingWindowContentHost ),
+              new FrameworkPropertyMetadata( SizeToContent.Manual, new PropertyChangedCallback( OnSizeToContentChanged ) ) );
+
+      /// <summary>
+      /// Gets or sets the SizeToContent property. 
+      /// </summary>
+      public SizeToContent SizeToContent
+      {
+        get
+        {
+          return (SizeToContent)GetValue( SizeToContentProperty );
+        }
+        set
+        {
+          SetValue( SizeToContentProperty, value );
+        }
+      }
+
+      /// <summary>
+      /// Handles changes to the SizeToContent property.
+      /// </summary>
+      private static void OnSizeToContentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+      {
+        ( (FloatingWindowContentHost)d ).OnSizeToContentChanged( (SizeToContent)e.OldValue, (SizeToContent)e.NewValue );
+      }
+
+      /// <summary>
+      /// Provides derived classes an opportunity to handle changes to the SizeToContent property.
+      /// </summary>
+      protected virtual void OnSizeToContentChanged( SizeToContent oldValue, SizeToContent newValue )
+      {
+        if( _wpfContentHost != null )
+        {
+          _wpfContentHost.SizeToContent = newValue;
+        }
       }
 
       #endregion
@@ -556,7 +659,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         _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 );
 
@@ -583,6 +686,16 @@ namespace Xceed.Wpf.AvalonDock.Controls
       }
 
       #endregion
+
+      #region Event Handlers
+
+      private void Content_SizeChanged( object sender, SizeChangedEventArgs e )
+      {
+        this.InvalidateMeasure();
+        this.InvalidateArrange();
+      }
+
+      #endregion
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
index 6ca2597f..944824ac 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
@@ -415,8 +415,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         }
         else
         {
-          var width = ( prevChildModel.DockWidth.IsAuto ) ? prevChildActualSize.Width : prevChildModel.DockWidth.Value;
-          prevChildModel.DockWidth = new GridLength( width + delta, GridUnitType.Pixel );
+          prevChildModel.DockWidth = new GridLength( prevChildModel.DockWidth.Value + delta, GridUnitType.Pixel );
         }
 
         if( nextChildModel.DockWidth.IsStar )
@@ -425,8 +424,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         }
         else
         {
-          var width = ( nextChildModel.DockWidth.IsAuto ) ? nextChildActualSize.Width : nextChildModel.DockWidth.Value;
-          nextChildModel.DockWidth = new GridLength( width - delta, GridUnitType.Pixel );
+          nextChildModel.DockWidth = new GridLength( nextChildModel.DockWidth.Value - delta, GridUnitType.Pixel );
         }
       }
       else
@@ -437,8 +435,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         }
         else
         {
-          var height = ( prevChildModel.DockHeight.IsAuto ) ? prevChildActualSize.Height : prevChildModel.DockHeight.Value;
-          prevChildModel.DockHeight = new GridLength( height + delta, GridUnitType.Pixel );
+          prevChildModel.DockHeight = new GridLength( prevChildModel.DockHeight.Value + delta, GridUnitType.Pixel );
         }
 
         if( nextChildModel.DockHeight.IsStar )
@@ -447,8 +444,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         }
         else
         {
-          var height = ( nextChildModel.DockHeight.IsAuto ) ? nextChildActualSize.Height : nextChildModel.DockHeight.Value;
-          nextChildModel.DockHeight = new GridLength( height - delta, GridUnitType.Pixel );
+          nextChildModel.DockHeight = new GridLength( nextChildModel.DockHeight.Value - delta, GridUnitType.Pixel );
         }
       }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
index 4f5d6d37..b2ad09b8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
@@ -94,15 +94,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
           _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 );
-            }
-          }
+          _view.SetBinding( ContentPresenter.ContentTemplateProperty, new Binding( "LayoutItemTemplate" ) { Source = LayoutElement.Root.Manager } );
+          _view.SetBinding( ContentPresenter.ContentTemplateSelectorProperty, new Binding( "LayoutItemTemplateSelector" ) { Source = LayoutElement.Root.Manager } );
+          LayoutElement.Root.Manager.InternalAddLogicalChild( _view );
         }
 
         return _view;
@@ -627,9 +621,14 @@ namespace Xceed.Wpf.AvalonDock.Controls
       return value;
     }
 
+    protected virtual bool CanExecuteDockAsDocumentCommand()
+    {
+      return ( LayoutElement != null && LayoutElement.CanDock && LayoutElement.FindParent<LayoutDocumentPane>() == null );
+    }
+
     private bool CanExecuteDockAsDocumentCommand( object parameter )
     {
-      return LayoutElement != null && LayoutElement.CanDock && LayoutElement.FindParent<LayoutDocumentPane>() == null;
+      return this.CanExecuteDockAsDocumentCommand();
     }
 
     private void ExecuteDockAsDocumentCommand( object parameter )
@@ -873,6 +872,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       if( LayoutElement == null )
         return false;
+      var layoutDocument = LayoutElement as LayoutDocument;
+      if( ( layoutDocument != null ) && !layoutDocument.CanMove )
+        return false;
       var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
       var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
       return ( ( parentDocumentGroup == null ||
@@ -948,6 +950,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       if( LayoutElement == null )
         return false;
+      var layoutDocument = LayoutElement as LayoutDocument;
+      if( ( layoutDocument != null ) && !layoutDocument.CanMove )
+        return false;
       var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
       var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
       return ( ( parentDocumentGroup == null ||
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
index 3cac7398..6f9ee404 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
@@ -244,85 +244,92 @@ namespace Xceed.Wpf.AvalonDock.Controls
       _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 )
+	  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;
+					  }
+					  else if (!this.Documents.Any() && this.Anchorables.Any())
+					  {
+						  this.InternalSetSelectedAnchorable(this.Anchorables.ToArray()[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 )
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs
index dd1770b2..236cc2a1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs
@@ -496,12 +496,20 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     void IOverlayWindow.DragEnter( IDropArea area )
     {
+      var floatingWindowManager = _floatingWindow.Model.Root.Manager;
+
       _visibleAreas.Add( area );
 
       FrameworkElement areaElement;
       switch( area.Type )
       {
         case DropAreaType.DockingManager:
+          var dropAreaDockingManager = area as DropArea<DockingManager>;
+          if( dropAreaDockingManager.AreaElement != floatingWindowManager )
+          {
+            _visibleAreas.Remove( area );
+            return;
+          }
           areaElement = _gridDockingManagerDropTargets;
           break;
         case DropAreaType.AnchorablePane:
@@ -509,6 +517,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
           var dropAreaAnchorablePaneGroup = area as DropArea<LayoutAnchorablePaneControl>;
           var layoutAnchorablePane = dropAreaAnchorablePaneGroup.AreaElement.Model as LayoutAnchorablePane;
+          if( layoutAnchorablePane.Root.Manager != floatingWindowManager )
+          {
+            _visibleAreas.Remove( area );
+            return;
+          }
           SetDropTargetIntoVisibility( layoutAnchorablePane );
           break;
         case DropAreaType.DocumentPaneGroup:
@@ -517,7 +530,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
             var dropAreaDocumentPaneGroup = area as DropArea<LayoutDocumentPaneGroupControl>;
             var layoutDocumentPane = ( dropAreaDocumentPaneGroup.AreaElement.Model as LayoutDocumentPaneGroup ).Children.First() as LayoutDocumentPane;
             var parentDocumentPaneGroup = layoutDocumentPane.Parent as LayoutDocumentPaneGroup;
-
+            if( parentDocumentPaneGroup.Root.Manager != floatingWindowManager )
+            {
+              _visibleAreas.Remove( area );
+              return;
+            }
             _documentPaneDropTargetLeft.Visibility = Visibility.Hidden;
             _documentPaneDropTargetRight.Visibility = Visibility.Hidden;
             _documentPaneDropTargetTop.Visibility = Visibility.Hidden;
@@ -537,6 +554,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
               var dropAreaDocumentPaneGroup = area as DropArea<LayoutDocumentPaneControl>;
               var layoutDocumentPane = dropAreaDocumentPaneGroup.AreaElement.Model as LayoutDocumentPane;
               var parentDocumentPaneGroup = layoutDocumentPane.Parent as LayoutDocumentPaneGroup;
+              if( layoutDocumentPane.Root.Manager != floatingWindowManager )
+              {
+                _visibleAreas.Remove( area );
+                return;
+              }
 
               SetDropTargetIntoVisibility( layoutDocumentPane );
 
@@ -628,6 +650,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
               var dropAreaDocumentPaneGroup = area as DropArea<LayoutDocumentPaneControl>;
               var layoutDocumentPane = dropAreaDocumentPaneGroup.AreaElement.Model as LayoutDocumentPane;
               var parentDocumentPaneGroup = layoutDocumentPane.Parent as LayoutDocumentPaneGroup;
+              if( layoutDocumentPane.Root.Manager != floatingWindowManager )
+              {
+                _visibleAreas.Remove( area );
+                return;
+              }
 
               SetDropTargetIntoVisibility( layoutDocumentPane );
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
index f1215f1d..bec4fba9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
@@ -1992,6 +1992,34 @@ namespace Xceed.Wpf.AvalonDock
       return _layoutItems.FirstOrDefault( item => item.LayoutElement == content );
     }
 
+    public LayoutFloatingWindowControl CreateFloatingWindow( LayoutContent contentModel, bool isContentImmutable )
+    {
+      LayoutFloatingWindowControl lfwc = null;
+
+      if( contentModel is LayoutAnchorable )
+      {
+        var parent = contentModel.Parent as ILayoutPane;
+        if( parent == null )
+        {
+          var pane = new LayoutAnchorablePane( contentModel as LayoutAnchorable )
+          {
+            FloatingTop = contentModel.FloatingTop,
+            FloatingLeft = contentModel.FloatingLeft,
+            FloatingWidth = contentModel.FloatingWidth,
+            FloatingHeight = contentModel.FloatingHeight
+          };
+          lfwc = this.CreateFloatingWindowForLayoutAnchorableWithoutParent( pane, isContentImmutable );
+        }
+      }
+
+      if( lfwc == null )
+      {
+        lfwc = this.CreateFloatingWindowCore( contentModel, isContentImmutable );
+      }
+
+      return lfwc;
+    }
+
     #endregion
 
     #region Internal Methods
@@ -2055,7 +2083,12 @@ namespace Xceed.Wpf.AvalonDock
         }
 
         newFW.ShowInTaskbar = false;
-        newFW.Show();
+
+        Dispatcher.BeginInvoke( new Action( () =>
+        {
+           newFW.Show();
+        } ), DispatcherPriority.Send );
+
         // Do not set the WindowState before showing or it will be lost
         if( paneForExtensions != null && paneForExtensions.IsMaximized )
         {
@@ -2137,200 +2170,26 @@ namespace Xceed.Wpf.AvalonDock
 
     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 )
+      var fwc = this.CreateFloatingWindow( contentModel, false );
+      if( fwc != 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()
+        Dispatcher.BeginInvoke( new Action( () =>
         {
-          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
-        };
+          if( startDrag )
+            fwc.AttachDrag();
+          fwc.Show();
+        } ), DispatcherPriority.Send );
       }
-
-
-      //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 fwc = this.CreateFloatingWindowForLayoutAnchorableWithoutParent( paneModel, false );
+      if( fwc != null )
       {
-        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;
+        fwc.AttachDrag();
+        fwc.Show();
       }
-
-
-      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()
@@ -2523,7 +2382,6 @@ namespace Xceed.Wpf.AvalonDock
 
     private void DockingManager_Unloaded( object sender, RoutedEventArgs e )
     {
-
       if( !DesignerProperties.GetIsInDesignMode( this ) )
       {
         if( _autoHideWindowManager != null )
@@ -2532,7 +2390,9 @@ namespace Xceed.Wpf.AvalonDock
         }
 
         if( AutoHideWindow != null )
+        {
           AutoHideWindow.Dispose();
+        }
 
         foreach( var fw in _fwList.ToArray() )
         {
@@ -2541,6 +2401,7 @@ namespace Xceed.Wpf.AvalonDock
           fw.KeepContentVisibleOnClose = true;
           fw.Close();
         }
+         _fwList.Clear();
 
         DestroyOverlayWindow();
         FocusElementManager.FinalizeFocusManagement( this );
@@ -2555,7 +2416,9 @@ namespace Xceed.Wpf.AvalonDock
         _autoHideWindowManager = new AutoHideWindowManager( this );
 
       if( AutoHideWindow != null )
+      {
         AutoHideWindow.Dispose();
+      }
 
       SetAutoHideWindow( new LayoutAutoHideWindowControl() );
     }
@@ -3220,6 +3083,199 @@ namespace Xceed.Wpf.AvalonDock
       _navigatorWindow = null;
     }
 
+    private LayoutFloatingWindowControl CreateFloatingWindowForLayoutAnchorableWithoutParent( LayoutAnchorablePane paneModel, bool isContentImmutable )
+    {
+      if( paneModel.Children.Any( c => !c.CanFloat ) )
+        return null;
+      var paneAsPositionableElement = paneModel as ILayoutPositionableElement;
+      var paneAsWithActualSize = paneModel as ILayoutPositionableElementWithActualSize;
+
+      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, isContentImmutable )
+      {
+        Width = fwWidth,
+        Height = fwHeight,
+        Top = fwTop,
+        Left = fwLeft
+      };
+
+
+
+      //fwc.Owner = Window.GetWindow(this);
+      //fwc.SetParentToMainWindowOf(this);
+
+
+      _fwList.Add( fwc );
+
+      Layout.CollectGarbage();
+
+      InvalidateArrange();
+
+      return fwc;
+    }
+
+    private LayoutFloatingWindowControl CreateFloatingWindowCore( LayoutContent contentModel, bool isContentImmutable )
+    {
+      if( !contentModel.CanFloat )
+        return null;
+      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, isContentImmutable )
+        {
+          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, isContentImmutable )
+        {
+          Width = fwWidth,
+          Height = fwHeight,
+          Left = contentModel.FloatingLeft,
+          Top = contentModel.FloatingTop
+        };
+      }
+
+
+      //fwc.Owner = Window.GetWindow(this);
+      //fwc.SetParentToMainWindowOf(this);
+
+
+      _fwList.Add( fwc );
+
+      Layout.CollectGarbage();
+
+      UpdateLayout();
+
+      return fwc;
+    }
+
     #endregion
 
     #region Events
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs
index 18114f48..c3d985ad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs
@@ -99,8 +99,8 @@ namespace Xceed.Wpf.AvalonDock.Layout
         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;
+            return ( layoutPanel.Children[ 0 ].Equals(element) || layoutPanel.Children[ 0 ].Descendents().Contains( element ) ) ? AnchorSide.Left : AnchorSide.Right;
+          return ( layoutPanel.Children[ 0 ].Equals( element ) || layoutPanel.Children[ 0 ].Descendents().Contains( element ) ) ? AnchorSide.Top : AnchorSide.Bottom;
         }
       }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
index 797ee9cc..ebdb6010 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
@@ -35,6 +35,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
     private double _autohideMinHeight = 100.0;
     private bool _canHide = true;
     private bool _canAutoHide = true;
+    private bool _canDockAsTabbedDocument = true;
     private bool _canCloseValueBeforeInternalSet;
 
     #endregion
@@ -181,6 +182,26 @@ namespace Xceed.Wpf.AvalonDock.Layout
 
     #endregion
 
+    #region CanDockAsTabbedDocument
+
+    public bool CanDockAsTabbedDocument
+    {
+      get
+      {
+        return _canDockAsTabbedDocument;
+      }
+      set
+      {
+        if( _canDockAsTabbedDocument != value )
+        {
+          _canDockAsTabbedDocument = value;
+          RaisePropertyChanged( "CanDockAsTabbedDocument" );
+        }
+      }
+    }
+
+    #endregion
+
     #region IsAutoHidden
 
     /// <summary>
@@ -326,6 +347,8 @@ namespace Xceed.Wpf.AvalonDock.Layout
         AutoHideMinWidth = double.Parse( reader.Value, CultureInfo.InvariantCulture );
       if( reader.MoveToAttribute( "AutoHideMinHeight" ) )
         AutoHideMinHeight = double.Parse( reader.Value, CultureInfo.InvariantCulture );
+      if( reader.MoveToAttribute( "CanDockAsTabbedDocument" ) )
+        CanDockAsTabbedDocument = bool.Parse( reader.Value );
 
       base.ReadXml( reader );
     }
@@ -344,7 +367,8 @@ namespace Xceed.Wpf.AvalonDock.Layout
         writer.WriteAttributeString( "AutoHideMinWidth", AutoHideMinWidth.ToString( CultureInfo.InvariantCulture ) );
       if( AutoHideMinHeight != 25.0 )
         writer.WriteAttributeString( "AutoHideMinHeight", AutoHideMinHeight.ToString( CultureInfo.InvariantCulture ) );
-
+      if( !CanDockAsTabbedDocument )
+        writer.WriteAttributeString( "CanDockAsTabbedDocument", CanDockAsTabbedDocument.ToString( CultureInfo.InvariantCulture ) );
 
       base.WriteXml( writer );
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
index 5246f879..a0c86963 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
@@ -22,7 +22,6 @@ using System.Windows;
 using System.Globalization;
 using System.Windows.Media;
 using System.ComponentModel;
-using Xceed.Wpf.AvalonDock.Controls;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
@@ -144,7 +143,6 @@ namespace Xceed.Wpf.AvalonDock.Layout
             parentSelector.SelectedContentIndex = _isSelected ? parentSelector.IndexOf( this ) : -1;
           OnIsSelectedChanged( oldValue, value );
           RaisePropertyChanged( "IsSelected" );
-          LayoutAnchorableTabItem.CancelMouseLeave();
         }
       }
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs
index bce826c2..10808225 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs
@@ -25,6 +25,27 @@ namespace Xceed.Wpf.AvalonDock.Layout
   {
     #region Properties
 
+    #region CanMove
+
+    internal bool _canMove = true;
+    public bool CanMove
+    {
+      get
+      {
+        return _canMove;
+      }
+      set
+      {
+        if( _canMove != value )
+        {
+          _canMove = value;
+          RaisePropertyChanged( "CanMove" );
+        }
+      }
+    }
+
+    #endregion
+
     #region IsVisible
 
     public bool IsVisible
@@ -74,12 +95,16 @@ namespace Xceed.Wpf.AvalonDock.Layout
 
       if( !string.IsNullOrWhiteSpace( this.Description ) )
         writer.WriteAttributeString( "Description", this.Description );
+      if( !CanMove )
+        writer.WriteAttributeString( "CanMove", CanMove.ToString() );
     }
 
     public override void ReadXml( System.Xml.XmlReader reader )
     {
       if( reader.MoveToAttribute( "Description" ) )
         this.Description = reader.Value;
+      if( reader.MoveToAttribute( "CanMove" ) )
+        CanMove = bool.Parse( reader.Value );
 
       base.ReadXml( reader );
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
index 89dab4dd..af82ccb4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
@@ -441,7 +441,8 @@
 
   <ControlTemplate x:Key="AnchorSideTemplate"
                    TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
-    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}"
+                  Background="{TemplateBinding Background}">
       <ItemsControl.ItemsPanel>
         <ItemsPanelTemplate>
           <StackPanel Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}" />
@@ -789,15 +790,19 @@
                                 Grid.Row="1" />
               <ContentPresenter Content="{TemplateBinding RightSidePanel}"
                                 Grid.Column="2"
-                                Grid.Row="1" />
+                                Grid.Row="0"
+                                Grid.RowSpan="3" />
               <ContentPresenter Content="{TemplateBinding LeftSidePanel}"
                                 Grid.Column="0"
-                                Grid.Row="1" />
+                                Grid.Row="0"
+                                Grid.RowSpan="3" />
               <ContentPresenter Content="{TemplateBinding TopSidePanel}"
-                                Grid.Column="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="3"
                                 Grid.Row="0" />
               <ContentPresenter Content="{TemplateBinding BottomSidePanel}"
-                                Grid.Column="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="3"
                                 Grid.Row="2" />
               <ContentPresenter x:Name="PART_AutoHideArea"
                                 Content="{TemplateBinding AutoHideWindow}"
@@ -834,7 +839,7 @@
                       <Border Background="{TemplateBinding Background}"
                               BorderBrush="{TemplateBinding BorderBrush}"
                               BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
+                        <ContentPresenter Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}"
                                           ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
                                           ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
                       </Border>
@@ -951,7 +956,7 @@
 
                           <ContentPresenter Grid.Row="1"
                                             FlowDirection="{TemplateBinding FlowDirection}"
-                                            Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
+                                            Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}" />
 
                           <!--<ContentPresenter 
                                 FlowDirection="{TemplateBinding FlowDirection}"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref
index 9253ed6a..4df65fb1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref
@@ -1,4 +1,4 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
 
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\Themes\generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\Themes\generic.xaml;;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index c65238fb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.i.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.i.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Themes/generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Themes/generic.baml
deleted file mode 100644
index f533a4a6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Themes/generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.de.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.de.resources
deleted file mode 100644
index 731974d0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.de.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.es.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.es.resources
deleted file mode 100644
index c9f8c2a3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.es.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources
deleted file mode 100644
index 273694c5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources
deleted file mode 100644
index ebb52947..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.it.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.it.resources
deleted file mode 100644
index 9ef18955..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.it.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources
deleted file mode 100644
index b92e3121..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.resources
deleted file mode 100644
index 3d76d4a7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources
deleted file mode 100644
index 72cc3572..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources
deleted file mode 100644
index 1a506a3f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources
deleted file mode 100644
index 0dcddefb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources
deleted file mode 100644
index c37ae25c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5e4d048b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\Xceed.Wpf.AvalonDock.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Themes\generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.it.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.es.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.de.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.g.resources
deleted file mode 100644
index c285362a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref
deleted file mode 100644
index 6fb7c203..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\GeneratedInternalTypeHelper.g.i.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\Themes\generic.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.lref
deleted file mode 100644
index 5c619c2d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\Themes\generic.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs
index b5ca1722..cc626fb5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs
@@ -19,7 +19,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "3.4";
+  public const string BaseVersion = "3.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + ".0.0";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.g.i.cs
deleted file mode 100644
index 6074267c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.g.i.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma checksum "..\..\Column.GenericContentTemplateSelectorResources.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BD9C873536475BFAAFD9882C16762C43A0262504"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-
-
-namespace Xceed.Wpf.DataGrid {
-    
-    
-    internal partial class GenericContentTemplateSelectorResources : System.Windows.ResourceDictionary, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/column.genericcontenttemplateselectorresources.xaml" +
-                    "", System.UriKind.Relative);
-            
-            #line 1 "..\..\Column.GenericContentTemplateSelectorResources.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Views/DataGridControlBackgroundBrushesResources.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Views/DataGridControlBackgroundBrushesResources.g.i.cs
deleted file mode 100644
index b6948a5f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Views/DataGridControlBackgroundBrushesResources.g.i.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma checksum "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6FE0E81405605C977E5F2D5B0199385384BF75E0"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-
-
-namespace Xceed.Wpf.DataGrid.Views {
-    
-    
-    internal partial class DataGridControlBackgroundBrushesResources : System.Windows.ResourceDictionary, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/views/datagridcontrolbackgroundbrushesresources.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.baml
deleted file mode 100644
index 36b7800c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.cs
deleted file mode 100644
index 6074267c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma checksum "..\..\Column.GenericContentTemplateSelectorResources.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BD9C873536475BFAAFD9882C16762C43A0262504"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-
-
-namespace Xceed.Wpf.DataGrid {
-    
-    
-    internal partial class GenericContentTemplateSelectorResources : System.Windows.ResourceDictionary, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/column.genericcontenttemplateselectorresources.xaml" +
-                    "", System.UriKind.Relative);
-            
-            #line 1 "..\..\Column.GenericContentTemplateSelectorResources.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.i.cs
deleted file mode 100644
index 6074267c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.i.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma checksum "..\..\Column.GenericContentTemplateSelectorResources.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BD9C873536475BFAAFD9882C16762C43A0262504"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-
-
-namespace Xceed.Wpf.DataGrid {
-    
-    
-    internal partial class GenericContentTemplateSelectorResources : System.Windows.ResourceDictionary, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/column.genericcontenttemplateselectorresources.xaml" +
-                    "", System.UriKind.Relative);
-            
-            #line 1 "..\..\Column.GenericContentTemplateSelectorResources.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.baml
deleted file mode 100644
index c1d826ff..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.cs
deleted file mode 100644
index 0f9c8090..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma checksum "..\..\DefaultCellEditorSelector.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "646EA40B7B056C9B73D1C184B3D7949C0ADEAA5A"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.Toolkit;
-
-
-namespace Xceed.Wpf.DataGrid {
-    
-    
-    internal partial class DefaultCellEditorSelector : System.Windows.FrameworkElement, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/defaultcelleditorselector.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\DefaultCellEditorSelector.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.i.cs
deleted file mode 100644
index 0f9c8090..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.i.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma checksum "..\..\DefaultCellEditorSelector.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "646EA40B7B056C9B73D1C184B3D7949C0ADEAA5A"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.Toolkit;
-
-
-namespace Xceed.Wpf.DataGrid {
-    
-    
-    internal partial class DefaultCellEditorSelector : System.Windows.FrameworkElement, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/defaultcelleditorselector.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\DefaultCellEditorSelector.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.i.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.i.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.baml
deleted file mode 100644
index 5c96d588..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.cs
deleted file mode 100644
index b6948a5f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma checksum "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6FE0E81405605C977E5F2D5B0199385384BF75E0"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-
-
-namespace Xceed.Wpf.DataGrid.Views {
-    
-    
-    internal partial class DataGridControlBackgroundBrushesResources : System.Windows.ResourceDictionary, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/views/datagridcontrolbackgroundbrushesresources.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.i.cs
deleted file mode 100644
index b6948a5f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.i.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma checksum "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6FE0E81405605C977E5F2D5B0199385384BF75E0"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-
-
-namespace Xceed.Wpf.DataGrid.Views {
-    
-    
-    internal partial class DataGridControlBackgroundBrushesResources : System.Windows.ResourceDictionary, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/views/datagridcontrolbackgroundbrushesresources.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.csproj.FileListAbsolute.txt
deleted file mode 100644
index 64ea0105..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.DataGrid.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.DataGrid.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Column.GenericContentTemplateSelectorResources.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\DefaultCellEditorSelector.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Views\DataGridControlBackgroundBrushesResources.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Column.GenericContentTemplateSelectorResources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\DefaultCellEditorSelector.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\aero.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\aero2.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\TableflowView.Aero.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\Resources\Aero.normalcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\Resources\Aero.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\Resources\TableView.Aero.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\TableView.Aero.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\classic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\TableflowView.Classic.systemcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\Resources\Classic.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\Resources\Classic.systemcolor.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\Resources\Classic.systemcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\TableView.Classic.systemcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\TableflowView.GridElementTemplates.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\Common.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\TableView.GridElementTemplates.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Controls\TableViewScrollViewer.generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableflowView.Luna.homestead.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableflowView.Luna.metallic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableflowView.Luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\TableflowView.Royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\Resources\TableView.Windows7.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\Resources\Windows7.Controls.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\Resources\Windows7.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\TableflowView.Windows7.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\TableView.Windows7.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\Resources\TableView.Aero2.normalcolor.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\Resources\Aero2.normalcolor.Controls.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\Resources\Aero2.normalcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\TableflowView.Aero2.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\TableView.Aero2.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\zune.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\TableflowView.Zune.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\Resources\Zune.normalcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\Resources\Zune.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\Resources\TableView.Zune.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\TableView.Zune.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\luna.homestead.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\luna.metallic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.homestead.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.metallic.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.normalcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\TableView.Luna.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableView.Luna.homestead.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableView.Luna.metallic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableView.Luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\Resources\Royale.normalcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\Resources\Royale.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\Resources\TableView.Royale.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\TableView.Royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Views\DataGridControlBackgroundBrushesResources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.g.resources
deleted file mode 100644
index 8e344446..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid_MarkupCompile.lref
deleted file mode 100644
index 9ed6815c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid_MarkupCompile.lref
+++ /dev/null
@@ -1,60 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Column.GenericContentTemplateSelectorResources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\DefaultCellEditorSelector.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero2.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableflowView.Aero.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.normalcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\TableView.Aero.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableView.Aero.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\classic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableflowView.Classic.systemcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableView.Classic.systemcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableflowView.GridElementTemplates.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\Common.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableView.GridElementTemplates.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Controls\TableViewScrollViewer.generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.homestead.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.metallic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableflowView.Royale.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\TableView.Windows7.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Controls.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableflowView.Windows7.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableView.Windows7.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\TableView.Aero2.normalcolor.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Controls.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableflowView.Aero2.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableView.Aero2.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\zune.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableflowView.Zune.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.normalcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\TableView.Zune.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableView.Zune.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.homestead.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.metallic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.homestead.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.metallic.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.normalcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\TableView.Luna.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.homestead.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.metallic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\royale.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.normalcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\TableView.Royale.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableView.Royale.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Views\DataGridControlBackgroundBrushesResources.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.Resources.baml
deleted file mode 100644
index 64359bcd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.normalcolor.Resources.baml
deleted file mode 100644
index 9dbedb74..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.normalcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/TableView.Aero.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/TableView.Aero.Graphics.baml
deleted file mode 100644
index c0b6572d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/TableView.Aero.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableView.Aero.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableView.Aero.normalcolor.baml
deleted file mode 100644
index b4ebbd18..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableView.Aero.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableflowView.Aero.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableflowView.Aero.normalcolor.baml
deleted file mode 100644
index 87bba28f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableflowView.Aero.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Controls.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Controls.baml
deleted file mode 100644
index eebd4cfc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Controls.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Resources.baml
deleted file mode 100644
index 3d66fc12..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.baml
deleted file mode 100644
index 0f322b68..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableView.Aero2.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableView.Aero2.normalcolor.baml
deleted file mode 100644
index e188fc34..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableView.Aero2.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableflowView.Aero2.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableflowView.Aero2.normalcolor.baml
deleted file mode 100644
index db72b5b6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableflowView.Aero2.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.Resources.baml
deleted file mode 100644
index e5d45d2b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Graphics.baml
deleted file mode 100644
index 6caf96e2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Resources.baml
deleted file mode 100644
index 05aff231..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableView.Classic.systemcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableView.Classic.systemcolor.baml
deleted file mode 100644
index 2df73889..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableView.Classic.systemcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableflowView.Classic.systemcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableflowView.Classic.systemcolor.baml
deleted file mode 100644
index 4e0a11eb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableflowView.Classic.systemcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Common.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Common.Resources.baml
deleted file mode 100644
index 516f3763..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Common.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Graphics.baml
deleted file mode 100644
index e077ab60..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableView.GridElementTemplates.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableView.GridElementTemplates.baml
deleted file mode 100644
index 561532c5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableView.GridElementTemplates.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableflowView.GridElementTemplates.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableflowView.GridElementTemplates.baml
deleted file mode 100644
index b2c38bec..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableflowView.GridElementTemplates.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Controls/TableViewScrollViewer.generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Controls/TableViewScrollViewer.generic.baml
deleted file mode 100644
index 5076fc1b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Controls/TableViewScrollViewer.generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.Resources.baml
deleted file mode 100644
index d20f0e74..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.homestead.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.homestead.Resources.baml
deleted file mode 100644
index b5e99209..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.homestead.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.metallic.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.metallic.Resources.baml
deleted file mode 100644
index 51415902..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.metallic.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.normalcolor.Resources.baml
deleted file mode 100644
index d59bb836..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.normalcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/TableView.Luna.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/TableView.Luna.Graphics.baml
deleted file mode 100644
index 5757fa41..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/TableView.Luna.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.homestead.baml
deleted file mode 100644
index bb01801e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.metallic.baml
deleted file mode 100644
index 984a6e03..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.normalcolor.baml
deleted file mode 100644
index 076e649c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.homestead.baml
deleted file mode 100644
index 1b4bf3e9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.metallic.baml
deleted file mode 100644
index 68ec3290..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.normalcolor.baml
deleted file mode 100644
index 3dd362dd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.Resources.baml
deleted file mode 100644
index 9b5a5ef8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.normalcolor.Resources.baml
deleted file mode 100644
index ece697bb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.normalcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/TableView.Royale.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/TableView.Royale.Graphics.baml
deleted file mode 100644
index c85d98f3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/TableView.Royale.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableView.Royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableView.Royale.normalcolor.baml
deleted file mode 100644
index 513ea033..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableView.Royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableflowView.Royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableflowView.Royale.normalcolor.baml
deleted file mode 100644
index 839546d9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableflowView.Royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/TableView.Windows7.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/TableView.Windows7.Graphics.baml
deleted file mode 100644
index d195f85c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/TableView.Windows7.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Controls.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Controls.baml
deleted file mode 100644
index cd4df751..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Controls.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Resources.baml
deleted file mode 100644
index 2f2e84be..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableView.Windows7.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableView.Windows7.baml
deleted file mode 100644
index b8769e73..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableView.Windows7.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableflowView.Windows7.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableflowView.Windows7.baml
deleted file mode 100644
index 38a2dee6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableflowView.Windows7.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/TableView.Zune.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/TableView.Zune.Graphics.baml
deleted file mode 100644
index c85d98f3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/TableView.Zune.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.Resources.baml
deleted file mode 100644
index 9b5a5ef8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.normalcolor.Resources.baml
deleted file mode 100644
index 6ecc4adf..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.normalcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableView.Zune.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableView.Zune.normalcolor.baml
deleted file mode 100644
index 47f9e9be..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableView.Zune.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableflowView.Zune.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableflowView.Zune.normalcolor.baml
deleted file mode 100644
index 7e62c133..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableflowView.Zune.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero.normalcolor.baml
deleted file mode 100644
index 7617345b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero2.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero2.normalcolor.baml
deleted file mode 100644
index 43d98bcd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero2.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/classic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/classic.baml
deleted file mode 100644
index 269679ba..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/classic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/generic.baml
deleted file mode 100644
index 874cfa2b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.homestead.baml
deleted file mode 100644
index 7827be79..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.metallic.baml
deleted file mode 100644
index e9863b09..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.normalcolor.baml
deleted file mode 100644
index ec9a76e4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/royale.normalcolor.baml
deleted file mode 100644
index d435ed7d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/zune.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/zune.normalcolor.baml
deleted file mode 100644
index 214c8483..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/zune.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt
index c380b492..513dc2c2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt
@@ -14,11 +14,7 @@
 
   ***********************************************************************************/
 
-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
 {
@@ -29,7 +25,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views
   {
     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
index fa6d2f2e..e4682b36 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt
@@ -28,157 +28,47 @@
     <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">
+            <Hyperlink NavigateUri="https://xceed.com/xceed-datagrid-for-wpf/" 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>
+         <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\DataGrid.png" Width="600" Height="400"/>
 
 </local:DemoView>
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
index e6f2523b..9893c4fe 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2014 Xceed Software Inc.
+   Copyright (C) 2007-2017 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
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
index e32ef1f5..4274e956 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt
@@ -15,7 +15,6 @@
   *************************************************************************************/
 
 using System.Data;
-using Xceed.Wpf.DataGrid;
 using System.Diagnostics;
 using System.Windows.Controls;
 using System.Windows.Data;
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
index 90768ddf..8cd6e595 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt
@@ -23,7 +23,6 @@ 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;
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
index 90d31027..4f50db53 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.cs.txt
@@ -26,7 +26,7 @@ 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
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt
index 2e32ea8d..26c65407 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt
@@ -21,169 +21,183 @@
                 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.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>
+  <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>
+  <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>
+    <GroupBox Header="Features"
+              HorizontalAlignment="Stretch">
+      <Grid>
+        <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="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"/>
+        <!-- 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="ShowDays:"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_showDays"
+                  Grid.Row="2"
+                  Grid.Column="1"
+                  IsChecked="{Binding ShowDays, ElementName=_timeSpanUpDown}"
+                  HorizontalAlignment="Left"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Grid.Row="3"
+                   Text="ShowSeconds:"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_showSeconds"
+                  Grid.Row="3"
+                  Grid.Column="1"
+                  IsChecked="{Binding ShowSeconds, ElementName=_timeSpanUpDown}"
+                  HorizontalAlignment="Left"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Grid.Row="4"
+                   Text="FractionalSecondsDigitsCount:"
+                   VerticalAlignment="Center" />
+        <xctk:IntegerUpDown x:Name="_fractionalSecondsDigitsCount"
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Value="{Binding FractionalSecondsDigitsCount, ElementName=_timeSpanUpDown}"
+                            Maximum="3"
+                            Minimum="0"
+                            HorizontalAlignment="Left"
+                            Margin="5,5,25,5" />
+        <TextBlock Grid.Row="5"
+                   Text="CurrentDateTimePart:"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_currentDateTimePart"
+                  Grid.Row="5"
+                  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>
+        <!-- 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>
+    <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"
+                           ShowDays="True"
+                           ShowSeconds="True"
+                           FractionalSecondsDigitsCount="0"
+                           CurrentDateTimePart="Hour24"
+                           Step="1" />
+    </StackPanel>
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml
index 279ed02b..30dca2e7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml
@@ -516,7 +516,8 @@
 
           </core:LiveExplorerTreeViewItem>
           <core:LiveExplorerTreeViewItem Header="DataGrid"
-                                         SampleType="{x:Type samples:DataGrid.Views.DataGridView}" />
+                                         SampleType="{x:Type samples:DataGrid.Views.DataGridView}"
+                                         IsPlusOnlyFeature="True" />
           <core:LiveExplorerTreeViewItem Header="Multi-Column ComboBox"
                                          SampleType="{x:Type samples:DataGrid.Views.MultiColumnComboBoxView}"
                                          IsPlusOnlyFeature="True" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
index 798e9a20..19e7f9ca 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
@@ -49,8 +49,8 @@ using System.Windows;
 // 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" )]
+[assembly: AssemblyVersion( "3.5.*" )]
+[assembly: AssemblyFileVersion( "3.5.0.0" )]
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.resx
index 562a3aac..1900d5b0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.resx
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.resx
@@ -3,7 +3,7 @@
   <!-- 
     Microsoft ResX Schema 
     
-    Version 3.4
+    Version 3.5
     
     The primary goals of this format is to allow a simple XML format 
     that is mostly human readable. The generation and parsing of the 
@@ -14,7 +14,7 @@
     
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">3.4</resheader>
+    <resheader name="version">3.5</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>
@@ -106,12 +106,12 @@
     <value>text/microsoft-resx</value>
   </resheader>
   <resheader name="version">
-    <value>3.4</value>
+    <value>3.5</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=3.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=3.5.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>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
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
index ec30f4b6..698a6e58 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.cs
@@ -14,9 +14,6 @@
 
   ***********************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 using Xceed.Wpf.Samples.SampleData;
 using System.Globalization;
@@ -24,18 +21,5 @@ 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/DataGrid.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/OpenSourceImages/DataGrid.png
new file mode 100644
index 00000000..2b4196d3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/OpenSourceImages/DataGrid.png 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
index fa6d2f2e..e4682b36 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml
@@ -28,157 +28,47 @@
     <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">
+            <Hyperlink NavigateUri="https://xceed.com/xceed-datagrid-for-wpf/" 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>
+         <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\DataGrid.png" Width="600" Height="400"/>
 
 </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
index c380b492..513dc2c2 100644
--- 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
@@ -14,11 +14,7 @@
 
   ***********************************************************************************/
 
-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
 {
@@ -29,7 +25,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views
   {
     public DataGridView()
     {
-      this.DataContext = SampleDataProvider.GetOrders();
       InitializeComponent();
     }
   }
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
index e32ef1f5..4274e956 100644
--- 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
@@ -15,7 +15,6 @@
   *************************************************************************************/
 
 using System.Data;
-using Xceed.Wpf.DataGrid;
 using System.Diagnostics;
 using System.Windows.Controls;
 using System.Windows.Data;
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
index e6f2523b..9893c4fe 100644
--- 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2014 Xceed Software Inc.
+   Copyright (C) 2007-2017 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
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
index 90768ddf..8cd6e595 100644
--- 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
@@ -23,7 +23,6 @@ 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;
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
index 90d31027..4f50db53 100644
--- 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
@@ -26,7 +26,7 @@ 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
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
index 2e32ea8d..26c65407 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml
@@ -21,169 +21,183 @@
                 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.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>
+  <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>
+  <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>
+    <GroupBox Header="Features"
+              HorizontalAlignment="Stretch">
+      <Grid>
+        <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="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"/>
+        <!-- 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="ShowDays:"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_showDays"
+                  Grid.Row="2"
+                  Grid.Column="1"
+                  IsChecked="{Binding ShowDays, ElementName=_timeSpanUpDown}"
+                  HorizontalAlignment="Left"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Grid.Row="3"
+                   Text="ShowSeconds:"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_showSeconds"
+                  Grid.Row="3"
+                  Grid.Column="1"
+                  IsChecked="{Binding ShowSeconds, ElementName=_timeSpanUpDown}"
+                  HorizontalAlignment="Left"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Grid.Row="4"
+                   Text="FractionalSecondsDigitsCount:"
+                   VerticalAlignment="Center" />
+        <xctk:IntegerUpDown x:Name="_fractionalSecondsDigitsCount"
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Value="{Binding FractionalSecondsDigitsCount, ElementName=_timeSpanUpDown}"
+                            Maximum="3"
+                            Minimum="0"
+                            HorizontalAlignment="Left"
+                            Margin="5,5,25,5" />
+        <TextBlock Grid.Row="5"
+                   Text="CurrentDateTimePart:"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_currentDateTimePart"
+                  Grid.Row="5"
+                  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>
+        <!-- 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>
+    <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"
+                           ShowDays="True"
+                           ShowSeconds="True"
+                           FractionalSecondsDigitsCount="0"
+                           CurrentDateTimePart="Hour24"
+                           Step="1" />
+    </StackPanel>
+  </Grid>
 </local:DemoView>
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
index 75a2ecac..8b58b09a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj
@@ -101,10 +101,6 @@
       <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>
@@ -179,7 +175,6 @@
       <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>
@@ -1426,6 +1421,9 @@
   <ItemGroup>
     <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialHamburger.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\DataGrid\OpenSourceImages\DataGrid.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config
deleted file mode 100644
index 23366171..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-            <setting name="lastSample" serializeAs="String">
-                <value/>
-            </setting>
-        </Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-    </userSettings>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="BA83FF368B7563C6" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-2.2.14066.5" newVersion="2.2.14066.5"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-</configuration>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.application b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
deleted file mode 100644
index 85f8d7ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.application" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="Xceed Software Inc." asmv2:product="Xceed Toolkit Plus for WPF LiveExplorer" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="true" mapFileExtensions="true" />
-  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.0" profile="Client" supportedRuntime="4.0.30319" />
-    <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
-  </compatibleFrameworks>
-  <dependency>
-    <dependentAssembly dependencyType="install" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest" size="17174">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>ob1xtL0NFoBuWOm6eWhtN/R2wCI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.config b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.config
deleted file mode 100644
index 23366171..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-            <setting name="lastSample" serializeAs="String">
-                <value/>
-            </setting>
-        </Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-    </userSettings>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="BA83FF368B7563C6" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-2.2.14066.5" newVersion="2.2.14066.5"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-</configuration>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
deleted file mode 100644
index df3d3358..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-  <description asmv2:iconFile="App.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <application />
-  <entryPoint>
-    <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-    <commandLine file="Xceed.Wpf.Toolkit.LiveExplorer.exe" parameters="" />
-  </entryPoint>
-  <trustInfo>
-    <security>
-      <applicationRequestMinimum>
-        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-      </applicationRequestMinimum>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-            If you want to change the Windows User Account Control level replace the 
-            requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel node will disable file and registry virtualization.
-            If you want to utilize File and Registry Virtualization for backward 
-            compatibility then delete the requestedExecutionLevel node.
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentOS>
-      <osVersionInfo>
-        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
-      </osVersionInfo>
-    </dependentOS>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.dll" size="427008">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fJ+tiQsbOQwfGd3itpkyUquu3RA=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="de\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="de" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>iK9HDffv2Q6qrh3sPkrXxIxhPYQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="es\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="es" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>5BfdaqLid+/kyJCQX52bEt2rEU8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>FmHDLfKoQyzMD6VzydX31KxFVwQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="hu\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="hu" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>HysaXhpNt3jXo9+ZbwTHhmqc/ZI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="it\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="it" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>wWS+24oJwFk6HrRmBg5TmTuOSrI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="pt-BR\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="pt-BR" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fLJrmg3/6gkuHVpvm48rHU0PQu8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ro\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ro" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>APZdP9nOSFv9/VEayZ7e1u3YQwg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ru\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ru" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dSmBWR4oV60hXzMEcu5Pzv78324=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="sv" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>v9u0pYRMOsstuMutmXdyhxwVSoE=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="zh-Hans" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>aLiV5N9DeMFHFId42Hauinb7z10=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Aero.dll" size="87040">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Aero" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>pHMnOAZhLdiVxLW8WVr7oKSNvzc=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="79872">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>6HW2YrRgZzx55mSInWqY5G2Rmtg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="84480">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dk2/e/lvOlxMqaSBa7vwkuVMmWY=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="2435584">
-      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>K9KOIk/JBcp0My6g71prOBaVSso=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Samples.SampleData.dll" size="2506240">
-      <assemblyIdentity name="Xceed.Wpf.Samples.SampleData" version="2.0.13161.5" publicKeyToken="BA83FF368B7563C6" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>h7GeHgNOmosQ3JAdBzkZH1g8UZs=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.dll" size="1104384">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>rzSCAw1wGgE9FFQGxPlp62E0H3E=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16285184">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>e/H+bvBidZ6C9yzoGNEGVxWvT3Q=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll" size="5632">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.resources" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>vsLAPrssl9QqQjMJSoMqV2acKVI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <file name="App.ico" size="31356">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>+gOYudfK6KDh/6TPnBz61fPTSDc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <file name="Xceed.Wpf.Toolkit.LiveExplorer.exe.config" size="1186">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>I+4TtxHlXRDLuy+spjHIoJq5EXc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
-      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
-    </application>
-  </compatibility>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.application b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.application
deleted file mode 100644
index 85f8d7ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.application
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.application" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="Xceed Software Inc." asmv2:product="Xceed Toolkit Plus for WPF LiveExplorer" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="true" mapFileExtensions="true" />
-  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.0" profile="Client" supportedRuntime="4.0.30319" />
-    <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
-  </compatibleFrameworks>
-  <dependency>
-    <dependentAssembly dependencyType="install" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest" size="17174">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>ob1xtL0NFoBuWOm6eWhtN/R2wCI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config
deleted file mode 100644
index 23366171..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-            <setting name="lastSample" serializeAs="String">
-                <value/>
-            </setting>
-        </Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-    </userSettings>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="BA83FF368B7563C6" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-2.2.14066.5" newVersion="2.2.14066.5"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-</configuration>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.manifest b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.manifest
deleted file mode 100644
index df3d3358..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.manifest
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-  <description asmv2:iconFile="App.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <application />
-  <entryPoint>
-    <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-    <commandLine file="Xceed.Wpf.Toolkit.LiveExplorer.exe" parameters="" />
-  </entryPoint>
-  <trustInfo>
-    <security>
-      <applicationRequestMinimum>
-        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-      </applicationRequestMinimum>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-            If you want to change the Windows User Account Control level replace the 
-            requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel node will disable file and registry virtualization.
-            If you want to utilize File and Registry Virtualization for backward 
-            compatibility then delete the requestedExecutionLevel node.
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentOS>
-      <osVersionInfo>
-        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
-      </osVersionInfo>
-    </dependentOS>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.dll" size="427008">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fJ+tiQsbOQwfGd3itpkyUquu3RA=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="de\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="de" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>iK9HDffv2Q6qrh3sPkrXxIxhPYQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="es\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="es" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>5BfdaqLid+/kyJCQX52bEt2rEU8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>FmHDLfKoQyzMD6VzydX31KxFVwQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="hu\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="hu" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>HysaXhpNt3jXo9+ZbwTHhmqc/ZI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="it\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="it" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>wWS+24oJwFk6HrRmBg5TmTuOSrI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="pt-BR\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="pt-BR" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fLJrmg3/6gkuHVpvm48rHU0PQu8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ro\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ro" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>APZdP9nOSFv9/VEayZ7e1u3YQwg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ru\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ru" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dSmBWR4oV60hXzMEcu5Pzv78324=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="sv" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>v9u0pYRMOsstuMutmXdyhxwVSoE=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="zh-Hans" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>aLiV5N9DeMFHFId42Hauinb7z10=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Aero.dll" size="87040">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Aero" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>pHMnOAZhLdiVxLW8WVr7oKSNvzc=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="79872">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>6HW2YrRgZzx55mSInWqY5G2Rmtg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="84480">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dk2/e/lvOlxMqaSBa7vwkuVMmWY=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="2435584">
-      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>K9KOIk/JBcp0My6g71prOBaVSso=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Samples.SampleData.dll" size="2506240">
-      <assemblyIdentity name="Xceed.Wpf.Samples.SampleData" version="2.0.13161.5" publicKeyToken="BA83FF368B7563C6" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>h7GeHgNOmosQ3JAdBzkZH1g8UZs=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.dll" size="1104384">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>rzSCAw1wGgE9FFQGxPlp62E0H3E=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16285184">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>e/H+bvBidZ6C9yzoGNEGVxWvT3Q=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll" size="5632">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.resources" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>vsLAPrssl9QqQjMJSoMqV2acKVI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <file name="App.ico" size="31356">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>+gOYudfK6KDh/6TPnBz61fPTSDc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <file name="Xceed.Wpf.Toolkit.LiveExplorer.exe.config" size="1186">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>I+4TtxHlXRDLuy+spjHIoJq5EXc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
-      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
-    </application>
-  </compatibility>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingDataGridView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingDataGridView.g.i.cs
index 8d343050..67966622 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingDataGridView.g.i.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingDataGridView.g.i.cs
@@ -29,11 +29,6 @@ using System.Windows.Media.TextFormatting;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
 using Xceed.Wpf.Toolkit;
 using Xceed.Wpf.Toolkit.Chromes;
 using Xceed.Wpf.Toolkit.Core.Converters;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.g.i.cs
index 6214c03d..23c36127 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.g.i.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.g.i.cs
@@ -29,11 +29,6 @@ using System.Windows.Media.TextFormatting;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
 using Xceed.Wpf.Toolkit;
 using Xceed.Wpf.Toolkit.Chromes;
 using Xceed.Wpf.Toolkit.Core.Converters;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
index 218309e4..fcd77f01 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
@@ -1,242 +1,239 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.config
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.csprojAssemblyReference.cache
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Resources\LiveExplorerScrollViewer.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Resources\TextBlockStyles.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Resources\Common.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Resources\CommonResources.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Resources\LastNameUserControlEditor.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\ItemTemplates\Common.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Resources\FancyStyles.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Resources\WindowModelEditor.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\App.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\HomeView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\MainWindow.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\IconButtonView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\ButtonSpinnerView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\DropDownSplitButtonView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Calculator\Views\CalculatorView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartAxisView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartLegendView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesBasicTypesView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesDataPointsBindingView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingAxesGridView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingColumnSeriesView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingLineSeriesView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingPieSeriesView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\CheckLists\Views\CheckListsView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Color\Views\ColorView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\DataGridView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\MultiColumnComboBoxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DateTime\Views\DateTimeView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\FilePicker\Views\FilePickerView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Gauge\Views\RadialGaugeView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ListBox\Views\ListBoxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Magnifier\Views\MagnifierView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialHamburgerView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialComboBoxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialListBoxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToolTipView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialDropDownView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSwitchView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialFrameView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTabsView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarCircularView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialRadioButtonView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialCheckBoxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToastView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSliderView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTextFieldView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialButtonView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialControlsView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MultiCalendar\Views\MultiCalendarView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Numeric\Views\NumericView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Panels\Views\SwitchPanelView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieChartView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieProgressView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PileFlowPanel\Views\PileFlowPanelView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Resources\LastNameUserControlEditor.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridAttributesView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\RangeSlider\Views\RangeSliderView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Rating\Views\RatingView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\SlideShow\Views\SlideShowView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\AutoSelectTextboxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MaskedTextboxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MultiLineTextEditorView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\RichTextboxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkPasswordBoxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkTextboxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingCoreWPFView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingDataGridView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingExtendedToolkitView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingListBoxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimelinePanel\Views\TimelinePanelView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimeSpan\Views\TimeSpanView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ToggleSwitch\Views\ToggleSwitchView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\TokenizedTextBoxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Resources\WindowModelEditor.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\ChildWindowView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\StyleableWindowView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\WindowContainerView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Wizard\Views\WizardView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Zoombox\Views\ZoomboxView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\App.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.cache
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.pdb
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.config
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.application
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.pdb
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.DataGrid.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Samples.SampleData.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.pdb
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.DataGrid.pdb
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.pdb
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\de\Xceed.Wpf.AvalonDock.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\es\Xceed.Wpf.AvalonDock.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\fr\Xceed.Wpf.AvalonDock.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\hu\Xceed.Wpf.AvalonDock.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\it\Xceed.Wpf.AvalonDock.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\ro\Xceed.Wpf.AvalonDock.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\ru\Xceed.Wpf.AvalonDock.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\sv\Xceed.Wpf.AvalonDock.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\AvalonDock\Views\AvalonDockView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingAvalonDockView.g.cs
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\HomeView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\MainWindow.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\AvalonDock\Views\AvalonDockView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\IconButtonView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\ButtonSpinnerView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\DropDownSplitButtonView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Calculator\Views\CalculatorView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartAxisView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartLegendView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesBasicTypesView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesDataPointsBindingView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingAxesGridView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingColumnSeriesView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingLineSeriesView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingPieSeriesView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\CheckLists\Views\CheckListsView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Color\Views\ColorView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\DataGridView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\MultiColumnComboBoxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DateTime\Views\DateTimeView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\FilePicker\Views\FilePickerView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Gauge\Views\RadialGaugeView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ListBox\Views\ListBoxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Magnifier\Views\MagnifierView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialHamburgerView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialComboBoxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialListBoxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToolTipView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialDropDownView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSwitchView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialFrameView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTabsView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarCircularView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialRadioButtonView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialCheckBoxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToastView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSliderView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTextFieldView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialButtonView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialControlsView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MultiCalendar\Views\MultiCalendarView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Numeric\Views\NumericView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Panels\Views\SwitchPanelView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieChartView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieProgressView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PileFlowPanel\Views\PileFlowPanelView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridAttributesView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\RangeSlider\Views\RangeSliderView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Rating\Views\RatingView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\SlideShow\Views\SlideShowView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\AutoSelectTextboxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MaskedTextboxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MultiLineTextEditorView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\RichTextboxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkPasswordBoxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkTextboxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingAvalonDockView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingCoreWPFView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingDataGridView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingExtendedToolkitView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingListBoxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimelinePanel\Views\TimelinePanelView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimeSpan\Views\TimeSpanView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ToggleSwitch\Views\ToggleSwitchView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\TokenizedTextBoxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\ChildWindowView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\StyleableWindowView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\WindowContainerView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Wizard\Views\WizardView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Zoombox\Views\ZoomboxView.baml
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.g.resources
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.csproj.GenerateResource.cache
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.csproj.CoreCompileInputs.cache
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.application
-C:\Users\johannes.brittain\source\repos\wpftoolkit\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.csproj.CopyComplete
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.config
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.application
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Samples.SampleData.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.csprojAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Resources\LiveExplorerScrollViewer.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Resources\TextBlockStyles.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Resources\Common.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Resources\CommonResources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Resources\LastNameUserControlEditor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\ItemTemplates\Common.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Resources\FancyStyles.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Resources\WindowModelEditor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\App.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\HomeView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\MainWindow.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\AvalonDock\Views\AvalonDockView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\IconButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\ButtonSpinnerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\DropDownSplitButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Calculator\Views\CalculatorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartAxisView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartLegendView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesBasicTypesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesDataPointsBindingView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingAxesGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingColumnSeriesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingLineSeriesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingPieSeriesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\CheckLists\Views\CheckListsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Color\Views\ColorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\DataGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\MultiColumnComboBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DateTime\Views\DateTimeView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\FilePicker\Views\FilePickerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Gauge\Views\RadialGaugeView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ListBox\Views\ListBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Magnifier\Views\MagnifierView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialHamburgerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialComboBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialListBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToolTipView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialDropDownView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSwitchView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialFrameView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTabsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarCircularView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialRadioButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialCheckBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToastView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSliderView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTextFieldView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialControlsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MultiCalendar\Views\MultiCalendarView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Numeric\Views\NumericView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Panels\Views\SwitchPanelView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieChartView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieProgressView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PileFlowPanel\Views\PileFlowPanelView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Resources\LastNameUserControlEditor.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridAttributesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\RangeSlider\Views\RangeSliderView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Rating\Views\RatingView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\SlideShow\Views\SlideShowView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\AutoSelectTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MaskedTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MultiLineTextEditorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\RichTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkPasswordBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingAvalonDockView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingCoreWPFView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingDataGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingExtendedToolkitView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingListBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimelinePanel\Views\TimelinePanelView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimeSpan\Views\TimeSpanView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ToggleSwitch\Views\ToggleSwitchView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\TokenizedTextBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Resources\WindowModelEditor.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\ChildWindowView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\StyleableWindowView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\WindowContainerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Wizard\Views\WizardView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Zoombox\Views\ZoomboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\App.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\HomeView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\MainWindow.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\AvalonDock\Views\AvalonDockView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\IconButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\ButtonSpinnerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\DropDownSplitButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Calculator\Views\CalculatorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartAxisView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartLegendView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesBasicTypesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesDataPointsBindingView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingAxesGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingColumnSeriesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingLineSeriesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingPieSeriesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\CheckLists\Views\CheckListsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Color\Views\ColorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\DataGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\MultiColumnComboBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DateTime\Views\DateTimeView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\FilePicker\Views\FilePickerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Gauge\Views\RadialGaugeView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ListBox\Views\ListBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Magnifier\Views\MagnifierView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialHamburgerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialComboBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialListBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToolTipView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialDropDownView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSwitchView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialFrameView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTabsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarCircularView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialRadioButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialCheckBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToastView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSliderView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTextFieldView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialControlsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MultiCalendar\Views\MultiCalendarView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Numeric\Views\NumericView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Panels\Views\SwitchPanelView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieChartView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieProgressView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PileFlowPanel\Views\PileFlowPanelView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridAttributesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\RangeSlider\Views\RangeSliderView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Rating\Views\RatingView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\SlideShow\Views\SlideShowView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\AutoSelectTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MaskedTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MultiLineTextEditorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\RichTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkPasswordBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingAvalonDockView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingCoreWPFView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingDataGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingExtendedToolkitView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingListBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimelinePanel\Views\TimelinePanelView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimeSpan\Views\TimeSpanView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ToggleSwitch\Views\ToggleSwitchView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\TokenizedTextBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\ChildWindowView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\StyleableWindowView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\WindowContainerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Wizard\Views\WizardView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Zoombox\Views\ZoomboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.csproj.GenerateResource.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.csproj.CoreCompileInputs.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.application
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.csproj.CopyComplete
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.baml
deleted file mode 100644
index a1d82d8e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.cs
deleted file mode 100644
index d1818617..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "390A483377036FCDA29DB7DD54DF5E9AF95187A7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer {
-    
-    
-    /// <summary>
-    /// App
-    /// </summary>
-    public partial class App : System.Windows.Application {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            
-            #line 19 "..\..\..\App.xaml"
-            this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
-            
-            #line default
-            #line hidden
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/app.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\App.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        /// <summary>
-        /// Application Entry Point.
-        /// </summary>
-        [System.STAThreadAttribute()]
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public static void Main() {
-            Xceed.Wpf.Toolkit.LiveExplorer.App app = new Xceed.Wpf.Toolkit.LiveExplorer.App();
-            app.InitializeComponent();
-            app.Run();
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.i.cs
deleted file mode 100644
index d1818617..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.i.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "390A483377036FCDA29DB7DD54DF5E9AF95187A7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer {
-    
-    
-    /// <summary>
-    /// App
-    /// </summary>
-    public partial class App : System.Windows.Application {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            
-            #line 19 "..\..\..\App.xaml"
-            this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
-            
-            #line default
-            #line hidden
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/app.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\App.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        /// <summary>
-        /// Application Entry Point.
-        /// </summary>
-        [System.STAThreadAttribute()]
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public static void Main() {
-            Xceed.Wpf.Toolkit.LiveExplorer.App app = new Xceed.Wpf.Toolkit.LiveExplorer.App();
-            app.InitializeComponent();
-            app.Run();
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.i.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.i.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.baml
deleted file mode 100644
index f3d7fa79..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.cs
deleted file mode 100644
index d045b4ec..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-#pragma checksum "..\..\..\HomeView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "93F1D27FBDD40851D9AE66FD9A5668B70EA6451C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer {
-    
-    
-    /// <summary>
-    /// HomeView
-    /// </summary>
-    public partial class HomeView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/homeview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\HomeView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.i.cs
deleted file mode 100644
index d045b4ec..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.i.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-#pragma checksum "..\..\..\HomeView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "93F1D27FBDD40851D9AE66FD9A5668B70EA6451C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer {
-    
-    
-    /// <summary>
-    /// HomeView
-    /// </summary>
-    public partial class HomeView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/homeview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\HomeView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.baml
deleted file mode 100644
index 01f525b4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.cs
deleted file mode 100644
index 7c4779ad..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3CF1EA66A822C4AC9CFE41DF8032D41B8B03A466"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Core;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer {
-    
-    
-    /// <summary>
-    /// MainWindow
-    /// </summary>
-    public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 453 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TreeView _treeView;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 730 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock VersionTextBlock;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 751 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ScrollViewer _contentScrollViewer;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 808 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Documents.FlowDocument _flowDocumentDesc;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/mainwindow.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\MainWindow.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 447 "..\..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Image)(target)).MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Image_MouseLeftButtonDown);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._treeView = ((System.Windows.Controls.TreeView)(target));
-            
-            #line 456 "..\..\..\MainWindow.xaml"
-            this._treeView.SelectedItemChanged += new System.Windows.RoutedPropertyChangedEventHandler<object>(this.OnTreeViewSelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.VersionTextBlock = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 4:
-            this._contentScrollViewer = ((System.Windows.Controls.ScrollViewer)(target));
-            return;
-            case 5:
-            this._flowDocumentDesc = ((System.Windows.Documents.FlowDocument)(target));
-            return;
-            case 6:
-            
-            #line 833 "..\..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.i.cs
deleted file mode 100644
index 7c4779ad..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.i.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3CF1EA66A822C4AC9CFE41DF8032D41B8B03A466"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Core;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer {
-    
-    
-    /// <summary>
-    /// MainWindow
-    /// </summary>
-    public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 453 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TreeView _treeView;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 730 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock VersionTextBlock;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 751 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ScrollViewer _contentScrollViewer;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 808 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Documents.FlowDocument _flowDocumentDesc;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/mainwindow.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\MainWindow.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 447 "..\..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Image)(target)).MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Image_MouseLeftButtonDown);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._treeView = ((System.Windows.Controls.TreeView)(target));
-            
-            #line 456 "..\..\..\MainWindow.xaml"
-            this._treeView.SelectedItemChanged += new System.Windows.RoutedPropertyChangedEventHandler<object>(this.OnTreeViewSelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.VersionTextBlock = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 4:
-            this._contentScrollViewer = ((System.Windows.Controls.ScrollViewer)(target));
-            return;
-            case 5:
-            this._flowDocumentDesc = ((System.Windows.Documents.FlowDocument)(target));
-            return;
-            case 6:
-            
-            #line 833 "..\..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/LiveExplorerScrollViewer.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/LiveExplorerScrollViewer.baml
deleted file mode 100644
index 3ff8c459..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/LiveExplorerScrollViewer.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/TextBlockStyles.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/TextBlockStyles.baml
deleted file mode 100644
index 5fb9d95a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/TextBlockStyles.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.baml
deleted file mode 100644
index 0d3bb33b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.cs
deleted file mode 100644
index 6758aea7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4184003D31925216F3878D31A0A038A151DC8366"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.AvalonDock;
-using Xceed.Wpf.AvalonDock.Controls;
-using Xceed.Wpf.AvalonDock.Converters;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Themes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views {
-    
-    
-    /// <summary>
-    /// AvalonDockView
-    /// </summary>
-    public partial class AvalonDockView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 43 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.DockingManager _dockingManager;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 57 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.Layout.LayoutRoot _layoutRoot;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/avalondock/views/avalondockview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._dockingManager = ((Xceed.Wpf.AvalonDock.DockingManager)(target));
-            return;
-            case 2:
-            this._layoutRoot = ((Xceed.Wpf.AvalonDock.Layout.LayoutRoot)(target));
-            return;
-            case 3:
-            
-            #line 160 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            
-            #line 164 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.LoadButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.i.cs
deleted file mode 100644
index 6758aea7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.i.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4184003D31925216F3878D31A0A038A151DC8366"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.AvalonDock;
-using Xceed.Wpf.AvalonDock.Controls;
-using Xceed.Wpf.AvalonDock.Converters;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Themes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views {
-    
-    
-    /// <summary>
-    /// AvalonDockView
-    /// </summary>
-    public partial class AvalonDockView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 43 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.DockingManager _dockingManager;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 57 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.Layout.LayoutRoot _layoutRoot;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/avalondock/views/avalondockview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._dockingManager = ((Xceed.Wpf.AvalonDock.DockingManager)(target));
-            return;
-            case 2:
-            this._layoutRoot = ((Xceed.Wpf.AvalonDock.Layout.LayoutRoot)(target));
-            return;
-            case 3:
-            
-            #line 160 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            
-            #line 164 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.LoadButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Resources/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Resources/Common.baml
deleted file mode 100644
index 3c2c4575..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Resources/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.baml
deleted file mode 100644
index fb3159f2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.cs
deleted file mode 100644
index 78ba4bd9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "505A4F840B035C9CE288E78CCEF88ED817BA6293"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views {
-    
-    
-    /// <summary>
-    /// BusyIndicatorCustomContentTemplateView
-    /// </summary>
-    public partial class BusyIndicatorCustomContentTemplateView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/busyindicator/views/busyindicat" +
-                    "orcustomcontenttemplateview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.i.cs
deleted file mode 100644
index 78ba4bd9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.i.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "505A4F840B035C9CE288E78CCEF88ED817BA6293"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views {
-    
-    
-    /// <summary>
-    /// BusyIndicatorCustomContentTemplateView
-    /// </summary>
-    public partial class BusyIndicatorCustomContentTemplateView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/busyindicator/views/busyindicat" +
-                    "orcustomcontenttemplateview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.baml
deleted file mode 100644
index 5582a180..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.cs
deleted file mode 100644
index 6ca5dc27..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6FE941C4EEF1E6592FC87A8051E4E818BF8F917C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views {
-    
-    
-    /// <summary>
-    /// BusyIndicatorCustomContentView
-    /// </summary>
-    public partial class BusyIndicatorCustomContentView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/busyindicator/views/busyindicat" +
-                    "orcustomcontentview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.i.cs
deleted file mode 100644
index 6ca5dc27..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.i.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6FE941C4EEF1E6592FC87A8051E4E818BF8F917C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views {
-    
-    
-    /// <summary>
-    /// BusyIndicatorCustomContentView
-    /// </summary>
-    public partial class BusyIndicatorCustomContentView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/busyindicator/views/busyindicat" +
-                    "orcustomcontentview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.baml
deleted file mode 100644
index 4d79ad7a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.cs
deleted file mode 100644
index 16aaaf8d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F3CABE2E47D5C9FD537D7CEFF5F2C544158B0465"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views {
-    
-    
-    /// <summary>
-    /// BusyIndicatorView
-    /// </summary>
-    public partial class BusyIndicatorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 58 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isBusy;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 62 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _displayAfter;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/busyindicator/views/busyindicat" +
-                    "orview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._isBusy = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 2:
-            this._displayAfter = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.i.cs
deleted file mode 100644
index 16aaaf8d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.i.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F3CABE2E47D5C9FD537D7CEFF5F2C544158B0465"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views {
-    
-    
-    /// <summary>
-    /// BusyIndicatorView
-    /// </summary>
-    public partial class BusyIndicatorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 58 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isBusy;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 62 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _displayAfter;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/busyindicator/views/busyindicat" +
-                    "orview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._isBusy = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 2:
-            this._displayAfter = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.baml
deleted file mode 100644
index 72e4d050..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.cs
deleted file mode 100644
index 16a193b2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D00037D3F411AFF3AF6F807E13314F217BA31C23"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views {
-    
-    
-    /// <summary>
-    /// ButtonSpinnerView
-    /// </summary>
-    public partial class ButtonSpinnerView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 62 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _allowSpin;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 65 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _showButtonSpinner;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/button/views/buttonspinnerview." +
-                    "xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._allowSpin = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 2:
-            this._showButtonSpinner = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            
-            #line 79 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-            ((Xceed.Wpf.Toolkit.ButtonSpinner)(target)).Spin += new System.EventHandler<Xceed.Wpf.Toolkit.SpinEventArgs>(this.ButtonSpinner_Spin);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.i.cs
deleted file mode 100644
index 16a193b2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.i.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D00037D3F411AFF3AF6F807E13314F217BA31C23"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views {
-    
-    
-    /// <summary>
-    /// ButtonSpinnerView
-    /// </summary>
-    public partial class ButtonSpinnerView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 62 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _allowSpin;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 65 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _showButtonSpinner;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/button/views/buttonspinnerview." +
-                    "xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._allowSpin = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 2:
-            this._showButtonSpinner = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            
-            #line 79 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-            ((Xceed.Wpf.Toolkit.ButtonSpinner)(target)).Spin += new System.EventHandler<Xceed.Wpf.Toolkit.SpinEventArgs>(this.ButtonSpinner_Spin);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.baml
deleted file mode 100644
index 98cbaac7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.cs
deleted file mode 100644
index 44fc4b44..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CCF7AFAB30ED1FAE033D8056CE3C2DF31E2F7D9B"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views {
-    
-    
-    /// <summary>
-    /// DropDownSplitButtonView
-    /// </summary>
-    public partial class DropDownSplitButtonView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 65 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown maxDropDownHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 78 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox dropDownPosition;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 92 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker dropDownContentBackground;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 118 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DropDownButton _dropDownButton;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 140 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.SplitButton _splitButton;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/button/views/dropdownsplitbutto" +
-                    "nview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 2:
-            this.dropDownPosition = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 3:
-            this.dropDownContentBackground = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 4:
-            this._dropDownButton = ((Xceed.Wpf.Toolkit.DropDownButton)(target));
-            
-            #line 127 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            this._dropDownButton.Click += new System.Windows.RoutedEventHandler(this.DropDownButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            
-            #line 131 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            this._splitButton = ((Xceed.Wpf.Toolkit.SplitButton)(target));
-            
-            #line 150 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            this._splitButton.Click += new System.Windows.RoutedEventHandler(this.SplitButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 7:
-            
-            #line 154 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.i.cs
deleted file mode 100644
index 44fc4b44..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.i.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CCF7AFAB30ED1FAE033D8056CE3C2DF31E2F7D9B"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views {
-    
-    
-    /// <summary>
-    /// DropDownSplitButtonView
-    /// </summary>
-    public partial class DropDownSplitButtonView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 65 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown maxDropDownHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 78 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox dropDownPosition;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 92 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker dropDownContentBackground;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 118 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DropDownButton _dropDownButton;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 140 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.SplitButton _splitButton;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/button/views/dropdownsplitbutto" +
-                    "nview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 2:
-            this.dropDownPosition = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 3:
-            this.dropDownContentBackground = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 4:
-            this._dropDownButton = ((Xceed.Wpf.Toolkit.DropDownButton)(target));
-            
-            #line 127 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            this._dropDownButton.Click += new System.Windows.RoutedEventHandler(this.DropDownButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            
-            #line 131 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            this._splitButton = ((Xceed.Wpf.Toolkit.SplitButton)(target));
-            
-            #line 150 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            this._splitButton.Click += new System.Windows.RoutedEventHandler(this.SplitButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 7:
-            
-            #line 154 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.baml
deleted file mode 100644
index 96b5d362..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.cs
deleted file mode 100644
index 2b9f6330..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "26D524D9CD0D9DCB643D75B9D9BCFCD2D683514F"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views {
-    
-    
-    /// <summary>
-    /// IconButtonView
-    /// </summary>
-    public partial class IconButtonView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 163 "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IconButton _iconButton;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/button/views/iconbuttonview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._iconButton = ((Xceed.Wpf.Toolkit.IconButton)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.i.cs
deleted file mode 100644
index 2b9f6330..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.i.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "26D524D9CD0D9DCB643D75B9D9BCFCD2D683514F"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views {
-    
-    
-    /// <summary>
-    /// IconButtonView
-    /// </summary>
-    public partial class IconButtonView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 163 "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IconButton _iconButton;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/button/views/iconbuttonview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._iconButton = ((Xceed.Wpf.Toolkit.IconButton)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.baml
deleted file mode 100644
index 6a49af3f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.cs
deleted file mode 100644
index 32307a6f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E87AC7A172AE27C61D008E01DE92F61D305BBBD1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Calculator.Views {
-    
-    
-    /// <summary>
-    /// CalculatorView
-    /// </summary>
-    public partial class CalculatorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 47 "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _precision;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/calculator/views/calculatorview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._precision = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.i.cs
deleted file mode 100644
index 32307a6f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.i.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E87AC7A172AE27C61D008E01DE92F61D305BBBD1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Calculator.Views {
-    
-    
-    /// <summary>
-    /// CalculatorView
-    /// </summary>
-    public partial class CalculatorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 47 "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _precision;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/calculator/views/calculatorview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._precision = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.baml
deleted file mode 100644
index be346396..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.cs
deleted file mode 100644
index 7995e4fc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8C804BAC059DE6A9167F0B4AE0B8060C1EC1752D"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartAxisView
-    /// </summary>
-    public partial class ChartAxisView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 23 "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartAxisView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartaxisview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartAxisView)(target));
-            return;
-            case 2:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.i.cs
deleted file mode 100644
index 7995e4fc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.i.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8C804BAC059DE6A9167F0B4AE0B8060C1EC1752D"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartAxisView
-    /// </summary>
-    public partial class ChartAxisView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 23 "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartAxisView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartaxisview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartAxisView)(target));
-            return;
-            case 2:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.baml
deleted file mode 100644
index 0a795ae9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.cs
deleted file mode 100644
index e658c128..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5B3473F047D9EBA09D5F80EEF14CBE425E00C9A2"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartLegendView
-    /// </summary>
-    public partial class ChartLegendView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartlegendview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.i.cs
deleted file mode 100644
index e658c128..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5B3473F047D9EBA09D5F80EEF14CBE425E00C9A2"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartLegendView
-    /// </summary>
-    public partial class ChartLegendView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartlegendview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.baml
deleted file mode 100644
index f0b7ebd7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.cs
deleted file mode 100644
index dc0f4669..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F42D42595B29EAC4CA2F06846B044A39E9A19EF1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartSeriesBasicTypesView
-    /// </summary>
-    public partial class ChartSeriesBasicTypesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartseriesbasictyp" +
-                    "esview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.i.cs
deleted file mode 100644
index dc0f4669..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F42D42595B29EAC4CA2F06846B044A39E9A19EF1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartSeriesBasicTypesView
-    /// </summary>
-    public partial class ChartSeriesBasicTypesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartseriesbasictyp" +
-                    "esview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.baml
deleted file mode 100644
index 8dc0db9b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.cs
deleted file mode 100644
index e303e8cf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BF7F10BC81C29636C39143B45DEB7CD3DDA62579"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartSeriesDataPointsBindingView
-    /// </summary>
-    public partial class ChartSeriesDataPointsBindingView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartseriesdatapoin" +
-                    "tsbindingview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.i.cs
deleted file mode 100644
index e303e8cf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.i.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BF7F10BC81C29636C39143B45DEB7CD3DDA62579"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartSeriesDataPointsBindingView
-    /// </summary>
-    public partial class ChartSeriesDataPointsBindingView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartseriesdatapoin" +
-                    "tsbindingview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.baml
deleted file mode 100644
index 3d866a51..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.cs
deleted file mode 100644
index 16113537..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5EFECE7A64E470F596F4AAC0D11813D8AD5AE1BC"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingAxesGridView
-    /// </summary>
-    public partial class ChartStylingAxesGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylingaxesgri" +
-                    "dview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 30 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.i.cs
deleted file mode 100644
index 16113537..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5EFECE7A64E470F596F4AAC0D11813D8AD5AE1BC"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingAxesGridView
-    /// </summary>
-    public partial class ChartStylingAxesGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylingaxesgri" +
-                    "dview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 30 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.baml
deleted file mode 100644
index a5c701a8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.cs
deleted file mode 100644
index 07f1b051..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C9998F13EBC3CEE5609463ED34AD14CD16A0D678"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingColumnSeriesView
-    /// </summary>
-    public partial class ChartStylingColumnSeriesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylingcolumns" +
-                    "eriesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.i.cs
deleted file mode 100644
index 07f1b051..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.i.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C9998F13EBC3CEE5609463ED34AD14CD16A0D678"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingColumnSeriesView
-    /// </summary>
-    public partial class ChartStylingColumnSeriesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylingcolumns" +
-                    "eriesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.baml
deleted file mode 100644
index d5ed77c9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.cs
deleted file mode 100644
index 7b330a82..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C07A3C4DE4E22FC130473B09CE7667D8AE629495"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingLineSeriesView
-    /// </summary>
-    public partial class ChartStylingLineSeriesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylinglineser" +
-                    "iesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.i.cs
deleted file mode 100644
index 7b330a82..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C07A3C4DE4E22FC130473B09CE7667D8AE629495"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingLineSeriesView
-    /// </summary>
-    public partial class ChartStylingLineSeriesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylinglineser" +
-                    "iesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.baml
deleted file mode 100644
index cc7759c8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.cs
deleted file mode 100644
index 6d05c33b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DA9803CB2637FF8978B290CD5C36E0D1C2BE40EE"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingPieSeriesView
-    /// </summary>
-    public partial class ChartStylingPieSeriesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylingpieseri" +
-                    "esview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.i.cs
deleted file mode 100644
index 6d05c33b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DA9803CB2637FF8978B290CD5C36E0D1C2BE40EE"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingPieSeriesView
-    /// </summary>
-    public partial class ChartStylingPieSeriesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylingpieseri" +
-                    "esview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.baml
deleted file mode 100644
index eea96d0f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.cs
deleted file mode 100644
index af4178c5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "941466095FB32B910BA0A512601E89AB0AA934B5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views {
-    
-    
-    /// <summary>
-    /// CheckListsView
-    /// </summary>
-    public partial class CheckListsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 22 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views.CheckListsView demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 75 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _delimiter;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 87 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _valueMemberPath;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 100 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _selectedValue;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 112 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _selectedMemberPath;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _displayMemberPath;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 140 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isSelectAllActive;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 154 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _selectAllContent;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 182 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isEditable;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 195 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isDropDownOpen;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 208 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maxDropDownHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 245 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CheckListBox _checkListBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 263 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CheckComboBox _checkComboBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/checklists/views/checklistsview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views.CheckListsView)(target));
-            return;
-            case 2:
-            this._delimiter = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this._valueMemberPath = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 4:
-            this._selectedValue = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 5:
-            this._selectedMemberPath = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 6:
-            this._displayMemberPath = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 7:
-            this._isSelectAllActive = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 8:
-            this._selectAllContent = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 9:
-            this._isEditable = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 10:
-            this._isDropDownOpen = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 11:
-            this._maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 12:
-            this._checkListBox = ((Xceed.Wpf.Toolkit.CheckListBox)(target));
-            return;
-            case 13:
-            this._checkComboBox = ((Xceed.Wpf.Toolkit.CheckComboBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.i.cs
deleted file mode 100644
index af4178c5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.i.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "941466095FB32B910BA0A512601E89AB0AA934B5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views {
-    
-    
-    /// <summary>
-    /// CheckListsView
-    /// </summary>
-    public partial class CheckListsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 22 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views.CheckListsView demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 75 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _delimiter;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 87 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _valueMemberPath;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 100 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _selectedValue;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 112 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _selectedMemberPath;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _displayMemberPath;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 140 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isSelectAllActive;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 154 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _selectAllContent;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 182 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isEditable;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 195 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isDropDownOpen;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 208 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maxDropDownHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 245 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CheckListBox _checkListBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 263 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CheckComboBox _checkComboBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/checklists/views/checklistsview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views.CheckListsView)(target));
-            return;
-            case 2:
-            this._delimiter = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this._valueMemberPath = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 4:
-            this._selectedValue = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 5:
-            this._selectedMemberPath = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 6:
-            this._displayMemberPath = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 7:
-            this._isSelectAllActive = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 8:
-            this._selectAllContent = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 9:
-            this._isEditable = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 10:
-            this._isDropDownOpen = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 11:
-            this._maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 12:
-            this._checkListBox = ((Xceed.Wpf.Toolkit.CheckListBox)(target));
-            return;
-            case 13:
-            this._checkComboBox = ((Xceed.Wpf.Toolkit.CheckComboBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.baml
deleted file mode 100644
index 83d013a4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.cs
deleted file mode 100644
index bb15b0bf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "83ED4E025BB07DA3C33D787885B15F688164251F"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Color.Views {
-    
-    
-    /// <summary>
-    /// ColorView
-    /// </summary>
-    public partial class ColorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 117 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _R;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 124 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _G;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 131 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _B;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 138 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _A;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 150 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _usingAlphaChannel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 166 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorCanvas _colorCanvas;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 339 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _colorPicker;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/color/views/colorview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._R = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 2:
-            this._G = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 3:
-            this._B = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 4:
-            this._A = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 5:
-            this._usingAlphaChannel = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 6:
-            this._colorCanvas = ((Xceed.Wpf.Toolkit.ColorCanvas)(target));
-            return;
-            case 7:
-            this._colorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.i.cs
deleted file mode 100644
index bb15b0bf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.i.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "83ED4E025BB07DA3C33D787885B15F688164251F"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Color.Views {
-    
-    
-    /// <summary>
-    /// ColorView
-    /// </summary>
-    public partial class ColorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 117 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _R;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 124 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _G;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 131 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _B;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 138 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _A;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 150 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _usingAlphaChannel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 166 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorCanvas _colorCanvas;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 339 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _colorPicker;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/color/views/colorview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._R = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 2:
-            this._G = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 3:
-            this._B = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 4:
-            this._A = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 5:
-            this._usingAlphaChannel = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 6:
-            this._colorCanvas = ((Xceed.Wpf.Toolkit.ColorCanvas)(target));
-            return;
-            case 7:
-            this._colorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.baml
deleted file mode 100644
index aec026a5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.cs
deleted file mode 100644
index 8d378346..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1C826C0FA58D15045E39A3749E2B76613FA36B03"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views {
-    
-    
-    /// <summary>
-    /// DataGridView
-    /// </summary>
-    public partial class DataGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 27 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.DataGridView _demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 99 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.DataGrid.DataGridControl _dataGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/datagrid/views/datagridview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.DataGridView)(target));
-            return;
-            case 2:
-            
-            #line 31 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this._dataGrid = ((Xceed.Wpf.DataGrid.DataGridControl)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.i.cs
deleted file mode 100644
index 8d378346..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.i.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1C826C0FA58D15045E39A3749E2B76613FA36B03"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views {
-    
-    
-    /// <summary>
-    /// DataGridView
-    /// </summary>
-    public partial class DataGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 27 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.DataGridView _demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 99 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.DataGrid.DataGridControl _dataGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/datagrid/views/datagridview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.DataGridView)(target));
-            return;
-            case 2:
-            
-            #line 31 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this._dataGrid = ((Xceed.Wpf.DataGrid.DataGridControl)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.baml
deleted file mode 100644
index 0856d7e8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.cs
deleted file mode 100644
index db46c926..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2C46586B1B83E9616A3E806F86D6795F97D1B157"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views {
-    
-    
-    /// <summary>
-    /// MultiColumnComboBoxView
-    /// </summary>
-    public partial class MultiColumnComboBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 22 "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.MultiColumnComboBoxView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/datagrid/views/multicolumncombo" +
-                    "boxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.MultiColumnComboBoxView)(target));
-            return;
-            case 2:
-            
-            #line 30 "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.i.cs
deleted file mode 100644
index db46c926..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.i.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2C46586B1B83E9616A3E806F86D6795F97D1B157"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views {
-    
-    
-    /// <summary>
-    /// MultiColumnComboBoxView
-    /// </summary>
-    public partial class MultiColumnComboBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 22 "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.MultiColumnComboBoxView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/datagrid/views/multicolumncombo" +
-                    "boxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.MultiColumnComboBoxView)(target));
-            return;
-            case 2:
-            
-            #line 30 "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.baml
deleted file mode 100644
index bf75611c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.cs
deleted file mode 100644
index 7b34a0a8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.cs
+++ /dev/null
@@ -1,354 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AE5461EE3B5F7FDAB21F0D2A6ADAC0C342F18CCC"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Views {
-    
-    
-    /// <summary>
-    /// DateTimeView
-    /// </summary>
-    public partial class DateTimeView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 96 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _format;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 98 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _formatString;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 100 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _watermark;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 102 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _autoCloseCalendar;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 104 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _clipValueToMinMax;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 106 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _kind;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 108 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _calendarDisplayMode;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 110 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _calendarWidth;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 112 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _showDropDownButton;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 114 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _timePickerVisibility;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 116 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _timePickerShowButtonSpinner;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 119 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _timeFormat;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 121 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _timeFormatString;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 123 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _timeWatermark;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _minimum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 127 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _maximum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 129 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _currentDateTimePart;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 135 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimePicker _datetimePicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 173 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _startTime;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 175 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _endTime;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 177 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _timeInterval;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 179 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maxDropDownHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 185 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimePicker _timePicker;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/datetime/views/datetimeview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._format = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 2:
-            this._formatString = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this._watermark = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 4:
-            this._autoCloseCalendar = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 5:
-            this._clipValueToMinMax = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 6:
-            this._kind = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 7:
-            this._calendarDisplayMode = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 8:
-            this._calendarWidth = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 9:
-            this._showDropDownButton = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 10:
-            this._timePickerVisibility = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 11:
-            this._timePickerShowButtonSpinner = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 12:
-            this._timeFormat = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 13:
-            this._timeFormatString = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 14:
-            this._timeWatermark = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 15:
-            this._minimum = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 16:
-            this._maximum = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 17:
-            this._currentDateTimePart = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 18:
-            this._datetimePicker = ((Xceed.Wpf.Toolkit.DateTimePicker)(target));
-            return;
-            case 19:
-            this._startTime = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 20:
-            this._endTime = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 21:
-            this._timeInterval = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 22:
-            this._maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 23:
-            this._timePicker = ((Xceed.Wpf.Toolkit.TimePicker)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.i.cs
deleted file mode 100644
index 7b34a0a8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.i.cs
+++ /dev/null
@@ -1,354 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AE5461EE3B5F7FDAB21F0D2A6ADAC0C342F18CCC"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Views {
-    
-    
-    /// <summary>
-    /// DateTimeView
-    /// </summary>
-    public partial class DateTimeView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 96 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _format;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 98 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _formatString;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 100 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _watermark;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 102 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _autoCloseCalendar;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 104 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _clipValueToMinMax;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 106 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _kind;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 108 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _calendarDisplayMode;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 110 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _calendarWidth;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 112 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _showDropDownButton;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 114 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _timePickerVisibility;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 116 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _timePickerShowButtonSpinner;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 119 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _timeFormat;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 121 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _timeFormatString;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 123 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _timeWatermark;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _minimum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 127 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _maximum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 129 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _currentDateTimePart;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 135 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimePicker _datetimePicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 173 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _startTime;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 175 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _endTime;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 177 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _timeInterval;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 179 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maxDropDownHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 185 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimePicker _timePicker;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/datetime/views/datetimeview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._format = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 2:
-            this._formatString = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this._watermark = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 4:
-            this._autoCloseCalendar = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 5:
-            this._clipValueToMinMax = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 6:
-            this._kind = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 7:
-            this._calendarDisplayMode = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 8:
-            this._calendarWidth = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 9:
-            this._showDropDownButton = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 10:
-            this._timePickerVisibility = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 11:
-            this._timePickerShowButtonSpinner = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 12:
-            this._timeFormat = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 13:
-            this._timeFormatString = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 14:
-            this._timeWatermark = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 15:
-            this._minimum = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 16:
-            this._maximum = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 17:
-            this._currentDateTimePart = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 18:
-            this._datetimePicker = ((Xceed.Wpf.Toolkit.DateTimePicker)(target));
-            return;
-            case 19:
-            this._startTime = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 20:
-            this._endTime = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 21:
-            this._timeInterval = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 22:
-            this._maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 23:
-            this._timePicker = ((Xceed.Wpf.Toolkit.TimePicker)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.baml
deleted file mode 100644
index 59c55589..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.cs
deleted file mode 100644
index cfab40ce..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FFD1E0CB98576A25E937EAADC5FAC5693319EA61"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views {
-    
-    
-    /// <summary>
-    /// FilePickerView
-    /// </summary>
-    public partial class FilePickerView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/filepicker/views/filepickerview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.i.cs
deleted file mode 100644
index cfab40ce..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FFD1E0CB98576A25E937EAADC5FAC5693319EA61"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views {
-    
-    
-    /// <summary>
-    /// FilePickerView
-    /// </summary>
-    public partial class FilePickerView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/filepicker/views/filepickerview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.baml
deleted file mode 100644
index 7ac9ab40..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.cs
deleted file mode 100644
index 5a25360f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1B8C9103AC8493381EA7BFE7B224823C95071389"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Converters;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views {
-    
-    
-    /// <summary>
-    /// RadialGaugeView
-    /// </summary>
-    public partial class RadialGaugeView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/gauge/views/radialgaugeview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.i.cs
deleted file mode 100644
index 5a25360f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1B8C9103AC8493381EA7BFE7B224823C95071389"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Converters;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views {
-    
-    
-    /// <summary>
-    /// RadialGaugeView
-    /// </summary>
-    public partial class RadialGaugeView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/gauge/views/radialgaugeview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.baml
deleted file mode 100644
index ef6cade2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.cs
deleted file mode 100644
index 526a9a8e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D6CD32989CB3B4DE3FB3B90B4A6070685E2A40B1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Converters;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views {
-    
-    
-    /// <summary>
-    /// ListBoxView
-    /// </summary>
-    public partial class ListBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/listbox/views/listboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 37 "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.i.cs
deleted file mode 100644
index 526a9a8e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.i.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D6CD32989CB3B4DE3FB3B90B4A6070685E2A40B1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Converters;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views {
-    
-    
-    /// <summary>
-    /// ListBoxView
-    /// </summary>
-    public partial class ListBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/listbox/views/listboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 37 "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.baml
deleted file mode 100644
index 5ed73908..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.cs
deleted file mode 100644
index 2df61ed9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2337CE89FBB5BDFC9E1F9DAEC4C05118389761B7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Views {
-    
-    
-    /// <summary>
-    /// MagnifierView
-    /// </summary>
-    public partial class MagnifierView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 67 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _zoomFactor;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 69 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isUsingZoomOnMouseWheel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 71 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _zoomFactorOnMouseWheel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 74 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _frameType;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 76 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _radius;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 78 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _width;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 80 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _height;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 83 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _borderThickness;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 85 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _colorPicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 91 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.RichTextBox _txtContent;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 96 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Magnifier _magnifier;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/magnifier/views/magnifierview.x" +
-                    "aml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._zoomFactor = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 2:
-            this._isUsingZoomOnMouseWheel = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._zoomFactorOnMouseWheel = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 4:
-            this._frameType = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 5:
-            this._radius = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 6:
-            this._width = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 7:
-            this._height = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 8:
-            this._borderThickness = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 9:
-            this._colorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 10:
-            this._txtContent = ((Xceed.Wpf.Toolkit.RichTextBox)(target));
-            return;
-            case 11:
-            this._magnifier = ((Xceed.Wpf.Toolkit.Magnifier)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.i.cs
deleted file mode 100644
index 2df61ed9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.i.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2337CE89FBB5BDFC9E1F9DAEC4C05118389761B7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Views {
-    
-    
-    /// <summary>
-    /// MagnifierView
-    /// </summary>
-    public partial class MagnifierView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 67 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _zoomFactor;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 69 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isUsingZoomOnMouseWheel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 71 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _zoomFactorOnMouseWheel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 74 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _frameType;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 76 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _radius;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 78 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _width;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 80 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _height;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 83 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _borderThickness;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 85 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _colorPicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 91 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.RichTextBox _txtContent;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 96 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Magnifier _magnifier;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/magnifier/views/magnifierview.x" +
-                    "aml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._zoomFactor = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 2:
-            this._isUsingZoomOnMouseWheel = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._zoomFactorOnMouseWheel = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 4:
-            this._frameType = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 5:
-            this._radius = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 6:
-            this._width = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 7:
-            this._height = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 8:
-            this._borderThickness = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 9:
-            this._colorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 10:
-            this._txtContent = ((Xceed.Wpf.Toolkit.RichTextBox)(target));
-            return;
-            case 11:
-            this._magnifier = ((Xceed.Wpf.Toolkit.Magnifier)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Resources/CommonResources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Resources/CommonResources.baml
deleted file mode 100644
index 35394e1f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Resources/CommonResources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.baml
deleted file mode 100644
index 901b985e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.cs
deleted file mode 100644
index ff22ae66..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2EAC5164A682FB91B6846992E5B20D52BAB354A9"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialButtonView
-    /// </summary>
-    public partial class MaterialButtonView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "buttonview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.i.cs
deleted file mode 100644
index ff22ae66..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2EAC5164A682FB91B6846992E5B20D52BAB354A9"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialButtonView
-    /// </summary>
-    public partial class MaterialButtonView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "buttonview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.baml
deleted file mode 100644
index cadbbf2e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.cs
deleted file mode 100644
index e0e9d276..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8BF9F38F89D04BC0EC062D65DCCB906E733D357B"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialCheckBoxView
-    /// </summary>
-    public partial class MaterialCheckBoxView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "checkboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.i.cs
deleted file mode 100644
index e0e9d276..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8BF9F38F89D04BC0EC062D65DCCB906E733D357B"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialCheckBoxView
-    /// </summary>
-    public partial class MaterialCheckBoxView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "checkboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.baml
deleted file mode 100644
index f5cf7d7c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.cs
deleted file mode 100644
index 3795f30e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0C9E22FDA71295E0D3EAFD589A1496F4D57B980A"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialComboBoxView
-    /// </summary>
-    public partial class MaterialComboBoxView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "comboboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.i.cs
deleted file mode 100644
index 3795f30e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0C9E22FDA71295E0D3EAFD589A1496F4D57B980A"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialComboBoxView
-    /// </summary>
-    public partial class MaterialComboBoxView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "comboboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.baml
deleted file mode 100644
index 199d188d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.cs
deleted file mode 100644
index 55d02931..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "868969B88088DD7201358BBA6922D086A7A39939"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialControlsView
-    /// </summary>
-    public partial class MaterialControlsView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "controlsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.i.cs
deleted file mode 100644
index 55d02931..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "868969B88088DD7201358BBA6922D086A7A39939"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialControlsView
-    /// </summary>
-    public partial class MaterialControlsView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "controlsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.baml
deleted file mode 100644
index 19cf382c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.cs
deleted file mode 100644
index 6867ad05..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "800D4D72EE7A2FEF6622191EB396B2EBBD00A4DA"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialDropDownView
-    /// </summary>
-    public partial class MaterialDropDownView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "dropdownview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.i.cs
deleted file mode 100644
index 6867ad05..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "800D4D72EE7A2FEF6622191EB396B2EBBD00A4DA"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialDropDownView
-    /// </summary>
-    public partial class MaterialDropDownView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "dropdownview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.baml
deleted file mode 100644
index a7e567f2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.cs
deleted file mode 100644
index bc5e64f7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "51E00456169AE2C251A2FCFD1961C5DE88301C33"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialFrameView
-    /// </summary>
-    public partial class MaterialFrameView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "frameview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.i.cs
deleted file mode 100644
index bc5e64f7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "51E00456169AE2C251A2FCFD1961C5DE88301C33"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialFrameView
-    /// </summary>
-    public partial class MaterialFrameView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "frameview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.baml
deleted file mode 100644
index 53d832e8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.cs
deleted file mode 100644
index 0dbbd96c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "413281F20C1136C4FA605EC5668DEEE815490490"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialHamburgerView
-    /// </summary>
-    public partial class MaterialHamburgerView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "hamburgerview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.i.cs
deleted file mode 100644
index 0dbbd96c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "413281F20C1136C4FA605EC5668DEEE815490490"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialHamburgerView
-    /// </summary>
-    public partial class MaterialHamburgerView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "hamburgerview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.baml
deleted file mode 100644
index 1d4515c4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.cs
deleted file mode 100644
index 34fbc2ff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0F28EC1AF2E636ACBE6BC2FA713AE3449A619D53"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialListBoxView
-    /// </summary>
-    public partial class MaterialListBoxView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "listboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.i.cs
deleted file mode 100644
index 34fbc2ff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0F28EC1AF2E636ACBE6BC2FA713AE3449A619D53"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialListBoxView
-    /// </summary>
-    public partial class MaterialListBoxView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "listboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.baml
deleted file mode 100644
index 457b9251..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.cs
deleted file mode 100644
index 96eb7254..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6CD67C33DF6EB4F77817E02C1C0019D4148D49CE"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialProgressBarCircularView
-    /// </summary>
-    public partial class MaterialProgressBarCircularView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "progressbarcircularview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.i.cs
deleted file mode 100644
index 96eb7254..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6CD67C33DF6EB4F77817E02C1C0019D4148D49CE"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialProgressBarCircularView
-    /// </summary>
-    public partial class MaterialProgressBarCircularView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "progressbarcircularview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.baml
deleted file mode 100644
index 9a7a9ce2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.cs
deleted file mode 100644
index 4ebc13c2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A4F97A3BCD49F6ECB5DA19B3E4DE4E1F6F3086B0"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialProgressBarView
-    /// </summary>
-    public partial class MaterialProgressBarView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "progressbarview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.i.cs
deleted file mode 100644
index 4ebc13c2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A4F97A3BCD49F6ECB5DA19B3E4DE4E1F6F3086B0"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialProgressBarView
-    /// </summary>
-    public partial class MaterialProgressBarView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "progressbarview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.baml
deleted file mode 100644
index d48e40b5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.cs
deleted file mode 100644
index 42652a16..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "94F13CA33AEC1D0FD87E6D178368EE63FF929112"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialRadioButtonView
-    /// </summary>
-    public partial class MaterialRadioButtonView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "radiobuttonview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.i.cs
deleted file mode 100644
index 42652a16..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "94F13CA33AEC1D0FD87E6D178368EE63FF929112"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialRadioButtonView
-    /// </summary>
-    public partial class MaterialRadioButtonView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "radiobuttonview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.baml
deleted file mode 100644
index 0f278dc1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.cs
deleted file mode 100644
index acac5c78..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DD445FA49F35D1A0C4A698CE9DA3611C6FA7A06E"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialSliderView
-    /// </summary>
-    public partial class MaterialSliderView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "sliderview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.i.cs
deleted file mode 100644
index acac5c78..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DD445FA49F35D1A0C4A698CE9DA3611C6FA7A06E"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialSliderView
-    /// </summary>
-    public partial class MaterialSliderView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "sliderview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.baml
deleted file mode 100644
index 47196bc8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.cs
deleted file mode 100644
index f0f407a9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "04E9529C35C75B82D3098D7B039CA367F8B0B4B8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialSwitchView
-    /// </summary>
-    public partial class MaterialSwitchView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "switchview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.i.cs
deleted file mode 100644
index f0f407a9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "04E9529C35C75B82D3098D7B039CA367F8B0B4B8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialSwitchView
-    /// </summary>
-    public partial class MaterialSwitchView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "switchview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.baml
deleted file mode 100644
index 5e466d40..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.cs
deleted file mode 100644
index cabc08e2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E1359ECF655E5AC17BE759F5FE1CC6A5406B599C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialTabsView
-    /// </summary>
-    public partial class MaterialTabsView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "tabsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.i.cs
deleted file mode 100644
index cabc08e2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E1359ECF655E5AC17BE759F5FE1CC6A5406B599C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialTabsView
-    /// </summary>
-    public partial class MaterialTabsView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "tabsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.baml
deleted file mode 100644
index 9544b6df..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.cs
deleted file mode 100644
index c816fba9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "523655B7A7BAF4A19B08674CB7A7F7C0053149F8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Data;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialTextFieldView
-    /// </summary>
-    public partial class MaterialTextFieldView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "textfieldview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.i.cs
deleted file mode 100644
index c816fba9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "523655B7A7BAF4A19B08674CB7A7F7C0053149F8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Data;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialTextFieldView
-    /// </summary>
-    public partial class MaterialTextFieldView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "textfieldview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.baml
deleted file mode 100644
index 09866039..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.cs
deleted file mode 100644
index 897ae98e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AA5522E305807B3D55CBC030AB353704C816C2F3"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialToastView
-    /// </summary>
-    public partial class MaterialToastView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "toastview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.i.cs
deleted file mode 100644
index 897ae98e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AA5522E305807B3D55CBC030AB353704C816C2F3"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialToastView
-    /// </summary>
-    public partial class MaterialToastView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "toastview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.baml
deleted file mode 100644
index 876ec085..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.cs
deleted file mode 100644
index 467aacb5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BECDDE7ED3349FD930612718F2AE6FB156CFE773"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialToolTipView
-    /// </summary>
-    public partial class MaterialToolTipView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "tooltipview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.i.cs
deleted file mode 100644
index 467aacb5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BECDDE7ED3349FD930612718F2AE6FB156CFE773"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialToolTipView
-    /// </summary>
-    public partial class MaterialToolTipView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "tooltipview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.baml
deleted file mode 100644
index 77ab8c5c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.cs
deleted file mode 100644
index 30fe588f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "57605BFC1725C0AFBE73E0F01CCD82CC3BA674C9"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views {
-    
-    
-    /// <summary>
-    /// MultiCalendarView
-    /// </summary>
-    public partial class MultiCalendarView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/multicalendar/views/multicalend" +
-                    "arview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 36 "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.i.cs
deleted file mode 100644
index 30fe588f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "57605BFC1725C0AFBE73E0F01CCD82CC3BA674C9"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views {
-    
-    
-    /// <summary>
-    /// MultiCalendarView
-    /// </summary>
-    public partial class MultiCalendarView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/multicalendar/views/multicalend" +
-                    "arview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 36 "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.baml
deleted file mode 100644
index 4678a1b6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.cs
deleted file mode 100644
index bbf99c69..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B729F3F01DA632A9C8D7CFBD3B8ACAB1A9150B39"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views {
-    
-    
-    /// <summary>
-    /// NumericView
-    /// </summary>
-    public partial class NumericView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 24 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views.NumericView _demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 399 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _doubleUpDown;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 436 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _enterClosesCalculator;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 459 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CalculatorUpDown _calculatorUpDown;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/numeric/views/numericview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views.NumericView)(target));
-            return;
-            case 2:
-            this._doubleUpDown = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 3:
-            this._enterClosesCalculator = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._calculatorUpDown = ((Xceed.Wpf.Toolkit.CalculatorUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.i.cs
deleted file mode 100644
index bbf99c69..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.i.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B729F3F01DA632A9C8D7CFBD3B8ACAB1A9150B39"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views {
-    
-    
-    /// <summary>
-    /// NumericView
-    /// </summary>
-    public partial class NumericView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 24 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views.NumericView _demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 399 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _doubleUpDown;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 436 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _enterClosesCalculator;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 459 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CalculatorUpDown _calculatorUpDown;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/numeric/views/numericview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views.NumericView)(target));
-            return;
-            case 2:
-            this._doubleUpDown = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 3:
-            this._enterClosesCalculator = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._calculatorUpDown = ((Xceed.Wpf.Toolkit.CalculatorUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.baml
deleted file mode 100644
index ad22235a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.cs
deleted file mode 100644
index c013ac46..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.cs
+++ /dev/null
@@ -1,331 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A5E53FAD1480C29CA65C0DD98E46866B692A5BA6"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views {
-    
-    
-    /// <summary>
-    /// SwitchPanelView
-    /// </summary>
-    public partial class SwitchPanelView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 130 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox layoutCombo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 161 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Panels.SwitchPanel _switchPanel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 163 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Panels.WrapPanel _wrapPanel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 164 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Panels.RandomPanel _randomPanel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 166 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 167 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 168 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 169 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item4;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 170 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item5;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 171 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item6;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 172 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item7;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 173 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item8;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 176 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Image _openSourceScreenShot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 177 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _openSourceScreenShotDesc;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 178 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.StackPanel _openSourceTextHyperlink;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 278 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _minimumWidth;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 290 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maximumWidth;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 303 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _minimumHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 315 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maximumHeight;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/panels/views/switchpanelview.xa" +
-                    "ml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.layoutCombo = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 130 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            this.layoutCombo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.OnLayoutComboSelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._switchPanel = ((Xceed.Wpf.Toolkit.Panels.SwitchPanel)(target));
-            
-            #line 161 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            this._switchPanel.ActiveLayoutChanged += new System.Windows.RoutedEventHandler(this.OnSwitchPanelLayoutChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this._wrapPanel = ((Xceed.Wpf.Toolkit.Panels.WrapPanel)(target));
-            return;
-            case 4:
-            this._randomPanel = ((Xceed.Wpf.Toolkit.Panels.RandomPanel)(target));
-            return;
-            case 5:
-            this._item1 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 6:
-            this._item2 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 7:
-            this._item3 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 8:
-            this._item4 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 9:
-            this._item5 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 10:
-            this._item6 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 11:
-            this._item7 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 12:
-            this._item8 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 13:
-            this._openSourceScreenShot = ((System.Windows.Controls.Image)(target));
-            return;
-            case 14:
-            this._openSourceScreenShotDesc = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 15:
-            this._openSourceTextHyperlink = ((System.Windows.Controls.StackPanel)(target));
-            return;
-            case 16:
-            
-            #line 181 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 17:
-            this._minimumWidth = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 18:
-            this._maximumWidth = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 19:
-            this._minimumHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 20:
-            this._maximumHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.i.cs
deleted file mode 100644
index c013ac46..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.i.cs
+++ /dev/null
@@ -1,331 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A5E53FAD1480C29CA65C0DD98E46866B692A5BA6"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views {
-    
-    
-    /// <summary>
-    /// SwitchPanelView
-    /// </summary>
-    public partial class SwitchPanelView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 130 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox layoutCombo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 161 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Panels.SwitchPanel _switchPanel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 163 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Panels.WrapPanel _wrapPanel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 164 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Panels.RandomPanel _randomPanel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 166 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 167 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 168 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 169 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item4;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 170 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item5;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 171 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item6;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 172 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item7;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 173 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item8;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 176 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Image _openSourceScreenShot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 177 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _openSourceScreenShotDesc;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 178 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.StackPanel _openSourceTextHyperlink;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 278 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _minimumWidth;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 290 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maximumWidth;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 303 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _minimumHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 315 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maximumHeight;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/panels/views/switchpanelview.xa" +
-                    "ml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.layoutCombo = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 130 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            this.layoutCombo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.OnLayoutComboSelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._switchPanel = ((Xceed.Wpf.Toolkit.Panels.SwitchPanel)(target));
-            
-            #line 161 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            this._switchPanel.ActiveLayoutChanged += new System.Windows.RoutedEventHandler(this.OnSwitchPanelLayoutChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this._wrapPanel = ((Xceed.Wpf.Toolkit.Panels.WrapPanel)(target));
-            return;
-            case 4:
-            this._randomPanel = ((Xceed.Wpf.Toolkit.Panels.RandomPanel)(target));
-            return;
-            case 5:
-            this._item1 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 6:
-            this._item2 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 7:
-            this._item3 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 8:
-            this._item4 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 9:
-            this._item5 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 10:
-            this._item6 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 11:
-            this._item7 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 12:
-            this._item8 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 13:
-            this._openSourceScreenShot = ((System.Windows.Controls.Image)(target));
-            return;
-            case 14:
-            this._openSourceScreenShotDesc = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 15:
-            this._openSourceTextHyperlink = ((System.Windows.Controls.StackPanel)(target));
-            return;
-            case 16:
-            
-            #line 181 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 17:
-            this._minimumWidth = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 18:
-            this._maximumWidth = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 19:
-            this._minimumHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 20:
-            this._maximumHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.baml
deleted file mode 100644
index 1f051c9b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.cs
deleted file mode 100644
index 91f085e1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8DB5421F5B54972E615E5155DFAF2B8D6BF16F39"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views {
-    
-    
-    /// <summary>
-    /// PieChartView
-    /// </summary>
-    public partial class PieChartView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid LayoutRoot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 130 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ListBox PieDataListBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 139 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Viewbox PiesViewbox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 147 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid PiesGrid;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 150 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie WaterPie;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 156 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie LactosePie;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 163 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie FatPie;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 170 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie ProteinPie;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pie/views/piechartview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.LayoutRoot = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 2:
-            this.PieDataListBox = ((System.Windows.Controls.ListBox)(target));
-            return;
-            case 3:
-            this.PiesViewbox = ((System.Windows.Controls.Viewbox)(target));
-            return;
-            case 4:
-            this.PiesGrid = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 5:
-            this.WaterPie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            case 6:
-            this.LactosePie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            case 7:
-            this.FatPie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            case 8:
-            this.ProteinPie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.i.cs
deleted file mode 100644
index 91f085e1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.i.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8DB5421F5B54972E615E5155DFAF2B8D6BF16F39"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views {
-    
-    
-    /// <summary>
-    /// PieChartView
-    /// </summary>
-    public partial class PieChartView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid LayoutRoot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 130 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ListBox PieDataListBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 139 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Viewbox PiesViewbox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 147 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid PiesGrid;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 150 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie WaterPie;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 156 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie LactosePie;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 163 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie FatPie;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 170 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie ProteinPie;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pie/views/piechartview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.LayoutRoot = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 2:
-            this.PieDataListBox = ((System.Windows.Controls.ListBox)(target));
-            return;
-            case 3:
-            this.PiesViewbox = ((System.Windows.Controls.Viewbox)(target));
-            return;
-            case 4:
-            this.PiesGrid = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 5:
-            this.WaterPie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            case 6:
-            this.LactosePie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            case 7:
-            this.FatPie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            case 8:
-            this.ProteinPie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.baml
deleted file mode 100644
index 2ebbe21e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.cs
deleted file mode 100644
index 1f0906a4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CEF066AEB8D966767707C2C40A63907BBE30371B"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views {
-    
-    
-    /// <summary>
-    /// PieProgressView
-    /// </summary>
-    public partial class PieProgressView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 80 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid LayoutRoot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 87 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ProgressBar progressBar;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 94 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button SimulateProgressButton;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pie/views/pieprogressview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.LayoutRoot = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 2:
-            this.progressBar = ((System.Windows.Controls.ProgressBar)(target));
-            return;
-            case 3:
-            this.SimulateProgressButton = ((System.Windows.Controls.Button)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.i.cs
deleted file mode 100644
index 1f0906a4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.i.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CEF066AEB8D966767707C2C40A63907BBE30371B"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views {
-    
-    
-    /// <summary>
-    /// PieProgressView
-    /// </summary>
-    public partial class PieProgressView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 80 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid LayoutRoot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 87 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ProgressBar progressBar;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 94 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button SimulateProgressButton;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pie/views/pieprogressview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.LayoutRoot = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 2:
-            this.progressBar = ((System.Windows.Controls.ProgressBar)(target));
-            return;
-            case 3:
-            this.SimulateProgressButton = ((System.Windows.Controls.Button)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.baml
deleted file mode 100644
index a4b83e8f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.cs
deleted file mode 100644
index 757d3d9d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5A199BC0E53011756378485BD4B51DDB87CAA705"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views {
-    
-    
-    /// <summary>
-    /// PieView
-    /// </summary>
-    public partial class PieView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 22 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views.PieView demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 118 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider endAngleSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 145 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider sliceSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 190 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker FillSelector;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 205 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker StrokeSelector;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 216 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie pie;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pie/views/pieview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views.PieView)(target));
-            return;
-            case 2:
-            
-            #line 79 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-            ((System.Windows.Controls.ComboBox)(target)).SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.endAngleSlider = ((System.Windows.Controls.Slider)(target));
-            return;
-            case 4:
-            this.sliceSlider = ((System.Windows.Controls.Slider)(target));
-            return;
-            case 5:
-            this.FillSelector = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 6:
-            this.StrokeSelector = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 7:
-            this.pie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.i.cs
deleted file mode 100644
index 757d3d9d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.i.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5A199BC0E53011756378485BD4B51DDB87CAA705"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views {
-    
-    
-    /// <summary>
-    /// PieView
-    /// </summary>
-    public partial class PieView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 22 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views.PieView demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 118 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider endAngleSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 145 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider sliceSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 190 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker FillSelector;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 205 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker StrokeSelector;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 216 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie pie;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pie/views/pieview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views.PieView)(target));
-            return;
-            case 2:
-            
-            #line 79 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-            ((System.Windows.Controls.ComboBox)(target)).SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.endAngleSlider = ((System.Windows.Controls.Slider)(target));
-            return;
-            case 4:
-            this.sliceSlider = ((System.Windows.Controls.Slider)(target));
-            return;
-            case 5:
-            this.FillSelector = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 6:
-            this.StrokeSelector = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 7:
-            this.pie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.baml
deleted file mode 100644
index 0fb6efd1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.cs
deleted file mode 100644
index 9f046c8a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "960DB9D59449C43DA09D49AF885A6357AF4BDD78"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views {
-    
-    
-    /// <summary>
-    /// PileFlowPanelView
-    /// </summary>
-    public partial class PileFlowPanelView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pileflowpanel/views/pileflowpan" +
-                    "elview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 37 "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.i.cs
deleted file mode 100644
index 9f046c8a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "960DB9D59449C43DA09D49AF885A6357AF4BDD78"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views {
-    
-    
-    /// <summary>
-    /// PileFlowPanelView
-    /// </summary>
-    public partial class PileFlowPanelView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pileflowpanel/views/pileflowpan" +
-                    "elview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 37 "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.baml
deleted file mode 100644
index b1dde000..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.cs
deleted file mode 100644
index 636771da..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E913F61FB79656ACEDB64F70D561FECC48D3A631"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid {
-    
-    
-    /// <summary>
-    /// LastNameUserControlEditor
-    /// </summary>
-    public partial class LastNameUserControlEditor : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 19 "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.LastNameUserControlEditor _uc;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/resources/lastname" +
-                    "usercontroleditor.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._uc = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.LastNameUserControlEditor)(target));
-            return;
-            case 2:
-            
-            #line 22 "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.i.cs
deleted file mode 100644
index 636771da..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.i.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E913F61FB79656ACEDB64F70D561FECC48D3A631"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid {
-    
-    
-    /// <summary>
-    /// LastNameUserControlEditor
-    /// </summary>
-    public partial class LastNameUserControlEditor : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 19 "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.LastNameUserControlEditor _uc;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/resources/lastname" +
-                    "usercontroleditor.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._uc = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.LastNameUserControlEditor)(target));
-            return;
-            case 2:
-            
-            #line 22 "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.baml
deleted file mode 100644
index 9ddedb75..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.cs
deleted file mode 100644
index 3d8bef33..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0623FDD0150C950FB06977EF0F9676B559E4EFE8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridAttributesView
-    /// </summary>
-    public partial class PropertyGridAttributesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 24 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridAttributesView demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 93 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "attributesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridAttributesView)(target));
-            return;
-            case 2:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.i.cs
deleted file mode 100644
index 3d8bef33..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.i.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0623FDD0150C950FB06977EF0F9676B559E4EFE8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridAttributesView
-    /// </summary>
-    public partial class PropertyGridAttributesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 24 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridAttributesView demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 93 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "attributesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridAttributesView)(target));
-            return;
-            case 2:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.baml
deleted file mode 100644
index 9e4e203d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.cs
deleted file mode 100644
index 79a4e687..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E802FBF54AE269D40E806F92AA976EFE243F6E08"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridBindingToStructsView
-    /// </summary>
-    public partial class PropertyGridBindingToStructsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 42 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "bindingtostructsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.i.cs
deleted file mode 100644
index 79a4e687..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.i.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E802FBF54AE269D40E806F92AA976EFE243F6E08"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridBindingToStructsView
-    /// </summary>
-    public partial class PropertyGridBindingToStructsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 42 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "bindingtostructsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.baml
deleted file mode 100644
index a3ea2e77..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.cs
deleted file mode 100644
index 58b0dbb7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "512AB8D60037112F341C336AFF6EEB2A2B143AF5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridCategoryOrderView
-    /// </summary>
-    public partial class PropertyGridCategoryOrderView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 48 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 58 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid2;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "categoryorderview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid1 = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            case 2:
-            this._propertyGrid2 = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.i.cs
deleted file mode 100644
index 58b0dbb7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.i.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "512AB8D60037112F341C336AFF6EEB2A2B143AF5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridCategoryOrderView
-    /// </summary>
-    public partial class PropertyGridCategoryOrderView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 48 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 58 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid2;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "categoryorderview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid1 = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            case 2:
-            this._propertyGrid2 = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.baml
deleted file mode 100644
index 242ca0b7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.cs
deleted file mode 100644
index fd9a8770..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CBFD1A4BE9958E5DCCCFEBE06A3CB750281911AB"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridCustomEditorsView
-    /// </summary>
-    public partial class PropertyGridCustomEditorsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 44 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "customeditorsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.i.cs
deleted file mode 100644
index fd9a8770..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.i.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CBFD1A4BE9958E5DCCCFEBE06A3CB750281911AB"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridCustomEditorsView
-    /// </summary>
-    public partial class PropertyGridCustomEditorsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 44 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "customeditorsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.baml
deleted file mode 100644
index e6ad46da..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.cs
deleted file mode 100644
index 727bff33..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "46F8C3EBEE66E5EC040BF1AAE9049BFBDDD3762C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridCustomPropertyView
-    /// </summary>
-    public partial class PropertyGridCustomPropertyView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "custompropertyview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.i.cs
deleted file mode 100644
index 727bff33..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "46F8C3EBEE66E5EC040BF1AAE9049BFBDDD3762C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridCustomPropertyView
-    /// </summary>
-    public partial class PropertyGridCustomPropertyView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "custompropertyview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.baml
deleted file mode 100644
index 014c81b9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.cs
deleted file mode 100644
index ca951f28..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8B118C07572544CF801E0DC545158499E00D2705"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridDefaultEditorsView
-    /// </summary>
-    public partial class PropertyGridDefaultEditorsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 36 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "defaulteditorsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.i.cs
deleted file mode 100644
index ca951f28..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.i.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8B118C07572544CF801E0DC545158499E00D2705"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridDefaultEditorsView
-    /// </summary>
-    public partial class PropertyGridDefaultEditorsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 36 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "defaulteditorsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.baml
deleted file mode 100644
index def65e2e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.cs
deleted file mode 100644
index 180256ff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BCB180E70ECD503761A3F4063E2CA8A71AE77F19"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridDefinitionKeyView
-    /// </summary>
-    public partial class PropertyGridDefinitionKeyView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "definitionkeyview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 39 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.i.cs
deleted file mode 100644
index 180256ff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BCB180E70ECD503761A3F4063E2CA8A71AE77F19"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridDefinitionKeyView
-    /// </summary>
-    public partial class PropertyGridDefinitionKeyView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "definitionkeyview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 39 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.baml
deleted file mode 100644
index 08808426..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.cs
deleted file mode 100644
index b62d4799..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "EFD087F8ABF8FDFA82CD8FA41C1FE34C65D62994"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridDisplayLocalizationView
-    /// </summary>
-    public partial class PropertyGridDisplayLocalizationView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "displaylocalizationview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 37 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.i.cs
deleted file mode 100644
index b62d4799..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "EFD087F8ABF8FDFA82CD8FA41C1FE34C65D62994"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridDisplayLocalizationView
-    /// </summary>
-    public partial class PropertyGridDisplayLocalizationView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "displaylocalizationview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 37 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.baml
deleted file mode 100644
index f00da8c1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.cs
deleted file mode 100644
index 792baaf9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "33A79C6B1B3142604623BDA581F80AE11866AB28"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridEditorDefinitionsView
-    /// </summary>
-    public partial class PropertyGridEditorDefinitionsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "editordefinitionsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 61 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.i.cs
deleted file mode 100644
index 792baaf9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.i.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "33A79C6B1B3142604623BDA581F80AE11866AB28"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridEditorDefinitionsView
-    /// </summary>
-    public partial class PropertyGridEditorDefinitionsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "editordefinitionsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 61 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.baml
deleted file mode 100644
index 8578e476..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.cs
deleted file mode 100644
index f3f2ce22..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4BF5D94B7BB623B62713F09D4DA03D484A8220D4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridExpandingNonPrimitivesView
-    /// </summary>
-    public partial class PropertyGridExpandingNonPrimitivesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "expandingnonprimitivesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.i.cs
deleted file mode 100644
index f3f2ce22..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4BF5D94B7BB623B62713F09D4DA03D484A8220D4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridExpandingNonPrimitivesView
-    /// </summary>
-    public partial class PropertyGridExpandingNonPrimitivesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "expandingnonprimitivesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.baml
deleted file mode 100644
index 30673bcb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.cs
deleted file mode 100644
index 928e1a62..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4DE5E5CA8B922893CA1724AD8094B1426C28B70D"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridMultiSelectedObjectsView
-    /// </summary>
-    public partial class PropertyGridMultiSelectedObjectsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "multiselectedobjectsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 30 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.i.cs
deleted file mode 100644
index 928e1a62..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4DE5E5CA8B922893CA1724AD8094B1426C28B70D"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridMultiSelectedObjectsView
-    /// </summary>
-    public partial class PropertyGridMultiSelectedObjectsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "multiselectedobjectsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 30 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.baml
deleted file mode 100644
index d388ae58..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.cs
deleted file mode 100644
index 54a4f144..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "23C8E55B4A654EACD0BBCEAA36E41076AA4A7CC6"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridPropertiesSourceView
-    /// </summary>
-    public partial class PropertyGridPropertiesSourceView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "propertiessourceview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.i.cs
deleted file mode 100644
index 54a4f144..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "23C8E55B4A654EACD0BBCEAA36E41076AA4A7CC6"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridPropertiesSourceView
-    /// </summary>
-    public partial class PropertyGridPropertiesSourceView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "propertiessourceview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.baml
deleted file mode 100644
index d7e8e60d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.cs
deleted file mode 100644
index 5130e396..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AB81972AB4BC2D28D735DB40BB9D7252F71594DA"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridPropertiesView
-    /// </summary>
-    public partial class PropertyGridPropertiesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "propertiesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 35 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.i.cs
deleted file mode 100644
index 5130e396..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AB81972AB4BC2D28D735DB40BB9D7252F71594DA"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridPropertiesView
-    /// </summary>
-    public partial class PropertyGridPropertiesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "propertiesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 35 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.baml
deleted file mode 100644
index 3dcf7739..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.cs
deleted file mode 100644
index ac91501b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DB85370E1749D4E78BE7358EE3A992EC8389FE91"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridPropertyItemStyleView
-    /// </summary>
-    public partial class PropertyGridPropertyItemStyleView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 51 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "propertyitemstyleview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            
-            #line 53 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml"
-            this._propertyGrid.PreparePropertyItem += new Xceed.Wpf.Toolkit.PropertyGrid.PropertyItemEventHandler(this.OnPreparePropertyItem);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.i.cs
deleted file mode 100644
index ac91501b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.i.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DB85370E1749D4E78BE7358EE3A992EC8389FE91"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridPropertyItemStyleView
-    /// </summary>
-    public partial class PropertyGridPropertyItemStyleView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 51 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "propertyitemstyleview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            
-            #line 53 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml"
-            this._propertyGrid.PreparePropertyItem += new Xceed.Wpf.Toolkit.PropertyGrid.PropertyItemEventHandler(this.OnPreparePropertyItem);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.baml
deleted file mode 100644
index 5755cd0f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.cs
deleted file mode 100644
index 3a9d5d58..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "77E7109F76CB0236E81F9B24ACD1CDEDAEA0378C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridSelectedObjectView
-    /// </summary>
-    public partial class PropertyGridSelectedObjectView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 56 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "selectedobjectview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 50 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            ((System.Windows.Controls.Button)(target)).GotFocus += new System.Windows.RoutedEventHandler(this.OnControlGetFocus);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            
-            #line 51 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            ((System.Windows.Controls.TextBox)(target)).GotFocus += new System.Windows.RoutedEventHandler(this.OnControlGetFocus);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 52 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            ((System.Windows.Controls.CheckBox)(target)).GotFocus += new System.Windows.RoutedEventHandler(this.OnControlGetFocus);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.i.cs
deleted file mode 100644
index 3a9d5d58..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.i.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "77E7109F76CB0236E81F9B24ACD1CDEDAEA0378C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridSelectedObjectView
-    /// </summary>
-    public partial class PropertyGridSelectedObjectView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 56 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "selectedobjectview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 50 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            ((System.Windows.Controls.Button)(target)).GotFocus += new System.Windows.RoutedEventHandler(this.OnControlGetFocus);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            
-            #line 51 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            ((System.Windows.Controls.TextBox)(target)).GotFocus += new System.Windows.RoutedEventHandler(this.OnControlGetFocus);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 52 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            ((System.Windows.Controls.CheckBox)(target)).GotFocus += new System.Windows.RoutedEventHandler(this.OnControlGetFocus);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.baml
deleted file mode 100644
index cbed201f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.cs
deleted file mode 100644
index e73927c5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "53E50D68A2D32100FA05F45B3129F35BEC4E7C79"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridSpecifyingPropertiesView
-    /// </summary>
-    public partial class PropertyGridSpecifyingPropertiesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 31 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "specifyingpropertiesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.i.cs
deleted file mode 100644
index e73927c5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.i.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "53E50D68A2D32100FA05F45B3129F35BEC4E7C79"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridSpecifyingPropertiesView
-    /// </summary>
-    public partial class PropertyGridSpecifyingPropertiesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 31 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "specifyingpropertiesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.baml
deleted file mode 100644
index 5a58e64a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.cs
deleted file mode 100644
index 143dbaa7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D17AE142089464F8385C3B28B5B3E8D98CAA9CD4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridView
-    /// </summary>
-    public partial class PropertyGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 193 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button _button;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 201 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._button = ((System.Windows.Controls.Button)(target));
-            return;
-            case 2:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.i.cs
deleted file mode 100644
index 143dbaa7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.i.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D17AE142089464F8385C3B28B5B3E8D98CAA9CD4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridView
-    /// </summary>
-    public partial class PropertyGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 193 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button _button;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 201 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._button = ((System.Windows.Controls.Button)(target));
-            return;
-            case 2:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.baml
deleted file mode 100644
index 05e0896f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.cs
deleted file mode 100644
index 5e766469..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E54E6C9158F28D1B24345C70089FF728F0474CE5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Views {
-    
-    
-    /// <summary>
-    /// RangeSliderView
-    /// </summary>
-    public partial class RangeSliderView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 637 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox lowerRangeStyleComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 660 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox rangeStyleComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 684 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox higherRangeStyleComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 732 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _tickPlacementComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 749 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _tickFrequency;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 775 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.RangeSlider _rangeSlider;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/rangeslider/views/rangeslidervi" +
-                    "ew.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.lowerRangeStyleComboBox = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 642 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            this.lowerRangeStyleComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.RangeStyleComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.rangeStyleComboBox = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 666 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            this.rangeStyleComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.RangeStyleComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.higherRangeStyleComboBox = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 690 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            this.higherRangeStyleComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.RangeStyleComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this._tickPlacementComboBox = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 5:
-            this._tickFrequency = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 6:
-            this._rangeSlider = ((Xceed.Wpf.Toolkit.RangeSlider)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.i.cs
deleted file mode 100644
index 5e766469..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.i.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E54E6C9158F28D1B24345C70089FF728F0474CE5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Views {
-    
-    
-    /// <summary>
-    /// RangeSliderView
-    /// </summary>
-    public partial class RangeSliderView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 637 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox lowerRangeStyleComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 660 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox rangeStyleComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 684 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox higherRangeStyleComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 732 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _tickPlacementComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 749 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _tickFrequency;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 775 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.RangeSlider _rangeSlider;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/rangeslider/views/rangeslidervi" +
-                    "ew.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.lowerRangeStyleComboBox = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 642 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            this.lowerRangeStyleComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.RangeStyleComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.rangeStyleComboBox = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 666 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            this.rangeStyleComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.RangeStyleComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.higherRangeStyleComboBox = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 690 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            this.higherRangeStyleComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.RangeStyleComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this._tickPlacementComboBox = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 5:
-            this._tickFrequency = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 6:
-            this._rangeSlider = ((Xceed.Wpf.Toolkit.RangeSlider)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.baml
deleted file mode 100644
index 93883238..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.cs
deleted file mode 100644
index 551e9db6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5A1C21CC0397875A9917B805332328A1D330BB9C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Rating.Views {
-    
-    
-    /// <summary>
-    /// RatingView
-    /// </summary>
-    public partial class RatingView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/rating/views/ratingview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.i.cs
deleted file mode 100644
index 551e9db6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.i.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5A1C21CC0397875A9917B805332328A1D330BB9C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Rating.Views {
-    
-    
-    /// <summary>
-    /// RatingView
-    /// </summary>
-    public partial class RatingView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/rating/views/ratingview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.baml
deleted file mode 100644
index 31e3ea40..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.cs
deleted file mode 100644
index d7625a4e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "95DC33002323CD8863E7794C4357D04911AF93CA"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Converters;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views {
-    
-    
-    /// <summary>
-    /// SlideShowView
-    /// </summary>
-    public partial class SlideShowView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/slideshow/views/slideshowview.x" +
-                    "aml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.i.cs
deleted file mode 100644
index d7625a4e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "95DC33002323CD8863E7794C4357D04911AF93CA"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Converters;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views {
-    
-    
-    /// <summary>
-    /// SlideShowView
-    /// </summary>
-    public partial class SlideShowView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/slideshow/views/slideshowview.x" +
-                    "aml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.baml
deleted file mode 100644
index 0f999e77..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.cs
deleted file mode 100644
index 8b1613ce..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DB7CF13012BE1B948B6AD10E166DBB97E480F0C7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// AutoSelectTextboxView
-    /// </summary>
-    public partial class AutoSelectTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 46 "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _autoSelectBehavior;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 53 "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _autoMoveFocus;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/autoselecttextboxvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._autoSelectBehavior = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 2:
-            this._autoMoveFocus = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.i.cs
deleted file mode 100644
index 8b1613ce..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.i.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DB7CF13012BE1B948B6AD10E166DBB97E480F0C7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// AutoSelectTextboxView
-    /// </summary>
-    public partial class AutoSelectTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 46 "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _autoSelectBehavior;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 53 "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _autoMoveFocus;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/autoselecttextboxvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._autoSelectBehavior = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 2:
-            this._autoMoveFocus = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.baml
deleted file mode 100644
index 69c4830c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.cs
deleted file mode 100644
index e60c4ffd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "802449787E09FE858E463E1A8E3FAB44E3F1F46E"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// MaskedTextboxView
-    /// </summary>
-    public partial class MaskedTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 49 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _literals;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 53 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _prompt;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 68 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _mask;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 72 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _value;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 76 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _text;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.MaskedTextBox _maskedTextBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/maskedtextboxview.xa" +
-                    "ml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._literals = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 2:
-            this._prompt = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._mask = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 4:
-            this._value = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 5:
-            this._text = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 6:
-            this._maskedTextBox = ((Xceed.Wpf.Toolkit.MaskedTextBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.i.cs
deleted file mode 100644
index e60c4ffd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.i.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "802449787E09FE858E463E1A8E3FAB44E3F1F46E"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// MaskedTextboxView
-    /// </summary>
-    public partial class MaskedTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 49 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _literals;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 53 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _prompt;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 68 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _mask;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 72 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _value;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 76 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _text;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.MaskedTextBox _maskedTextBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/maskedtextboxview.xa" +
-                    "ml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._literals = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 2:
-            this._prompt = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._mask = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 4:
-            this._value = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 5:
-            this._text = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 6:
-            this._maskedTextBox = ((Xceed.Wpf.Toolkit.MaskedTextBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.baml
deleted file mode 100644
index c54b7fea..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.cs
deleted file mode 100644
index 8a6fe339..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "55C827B217CE3D9C9AE341D9D5252846ED4BF0D3"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// MultiLineTextEditorView
-    /// </summary>
-    public partial class MultiLineTextEditorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 52 "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.DataGrid _dataGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/multilinetexteditorv" +
-                    "iew.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._dataGrid = ((System.Windows.Controls.DataGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.i.cs
deleted file mode 100644
index 8a6fe339..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.i.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "55C827B217CE3D9C9AE341D9D5252846ED4BF0D3"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// MultiLineTextEditorView
-    /// </summary>
-    public partial class MultiLineTextEditorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 52 "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.DataGrid _dataGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/multilinetexteditorv" +
-                    "iew.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._dataGrid = ((System.Windows.Controls.DataGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.baml
deleted file mode 100644
index b3a15992..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.cs
deleted file mode 100644
index 150d07bd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5031BDE822986E7B67194FBF1BAEB91CDD631CF7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// RichTextboxView
-    /// </summary>
-    public partial class RichTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 48 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _textFormatter;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 54 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _text;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 61 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.RichTextBox _richTextBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/richtextboxview.xaml" +
-                    "", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._textFormatter = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 48 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-            this._textFormatter.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.OnTextFormatterChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._text = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this._richTextBox = ((Xceed.Wpf.Toolkit.RichTextBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.i.cs
deleted file mode 100644
index 150d07bd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.i.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5031BDE822986E7B67194FBF1BAEB91CDD631CF7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// RichTextboxView
-    /// </summary>
-    public partial class RichTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 48 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _textFormatter;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 54 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _text;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 61 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.RichTextBox _richTextBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/richtextboxview.xaml" +
-                    "", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._textFormatter = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 48 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-            this._textFormatter.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.OnTextFormatterChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._text = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this._richTextBox = ((Xceed.Wpf.Toolkit.RichTextBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.baml
deleted file mode 100644
index 5cfd1579..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.cs
deleted file mode 100644
index d9c0cfed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B7A4A38FD147D6CBC1DE881ABABA24AF9A6B8AD1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TokenizedTextBox.Views {
-    
-    
-    /// <summary>
-    /// TokenizedTextBoxView
-    /// </summary>
-    public partial class TokenizedTextBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/tokenizedtextboxview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.i.cs
deleted file mode 100644
index d9c0cfed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.i.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B7A4A38FD147D6CBC1DE881ABABA24AF9A6B8AD1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TokenizedTextBox.Views {
-    
-    
-    /// <summary>
-    /// TokenizedTextBoxView
-    /// </summary>
-    public partial class TokenizedTextBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/tokenizedtextboxview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.baml
deleted file mode 100644
index a7068b2c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.cs
deleted file mode 100644
index 179b9ae6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "03C90A2C3343D96CA8C029FF6CBB2AC9C2864588"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// WatermarkPasswordBoxView
-    /// </summary>
-    public partial class WatermarkPasswordBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _passwordTextBlock;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 132 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.WatermarkPasswordBox _watermarkPasswordBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/watermarkpasswordbox" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._passwordTextBlock = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 2:
-            this._watermarkPasswordBox = ((Xceed.Wpf.Toolkit.WatermarkPasswordBox)(target));
-            
-            #line 140 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-            this._watermarkPasswordBox.PasswordChanged += new System.Windows.RoutedEventHandler(this.WatermarkPasswordBox_PasswordChanged);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.i.cs
deleted file mode 100644
index 179b9ae6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.i.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "03C90A2C3343D96CA8C029FF6CBB2AC9C2864588"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// WatermarkPasswordBoxView
-    /// </summary>
-    public partial class WatermarkPasswordBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _passwordTextBlock;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 132 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.WatermarkPasswordBox _watermarkPasswordBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/watermarkpasswordbox" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._passwordTextBlock = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 2:
-            this._watermarkPasswordBox = ((Xceed.Wpf.Toolkit.WatermarkPasswordBox)(target));
-            
-            #line 140 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-            this._watermarkPasswordBox.PasswordChanged += new System.Windows.RoutedEventHandler(this.WatermarkPasswordBox_PasswordChanged);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.baml
deleted file mode 100644
index be4fc66a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.cs
deleted file mode 100644
index f2ef30c4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "059FD34FCB082172FF3FBCB6F4A5A7B8229E3D1C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// WatermarkTextboxView
-    /// </summary>
-    public partial class WatermarkTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 40 "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _keepWatermarkOnGotFocus;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/watermarktextboxview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._keepWatermarkOnGotFocus = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.i.cs
deleted file mode 100644
index f2ef30c4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.i.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "059FD34FCB082172FF3FBCB6F4A5A7B8229E3D1C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// WatermarkTextboxView
-    /// </summary>
-    public partial class WatermarkTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 40 "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _keepWatermarkOnGotFocus;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/watermarktextboxview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._keepWatermarkOnGotFocus = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/ItemTemplates/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/ItemTemplates/Common.baml
deleted file mode 100644
index 312235f0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/ItemTemplates/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.baml
deleted file mode 100644
index eb3d5ce3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.cs
deleted file mode 100644
index 034d4173..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "35C17E62EC5A6FCAC3D4DAED30DD19C7F6BBC224"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.AvalonDock;
-using Xceed.Wpf.AvalonDock.Controls;
-using Xceed.Wpf.AvalonDock.Converters;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Themes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingAvalonDockView
-    /// </summary>
-    public partial class ThemingAvalonDockView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 25 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingAvalonDockView _demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 121 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _themeCombo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 169 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem metroDarkComboBoxItem;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 176 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem metroLightComboBoxItem;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 194 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Border SampleBorder;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 196 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.DockingManager _dockingManager;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 211 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.Layout.LayoutRoot _layoutRoot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 309 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Image _openSourceScreenShot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 310 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.StackPanel _openSourceTextHyperlink;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingavalondock" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingAvalonDockView)(target));
-            return;
-            case 2:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this._themeCombo = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 4:
-            this.metroDarkComboBoxItem = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem)(target));
-            return;
-            case 5:
-            this.metroLightComboBoxItem = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem)(target));
-            return;
-            case 6:
-            this.SampleBorder = ((System.Windows.Controls.Border)(target));
-            return;
-            case 7:
-            this._dockingManager = ((Xceed.Wpf.AvalonDock.DockingManager)(target));
-            return;
-            case 8:
-            this._layoutRoot = ((Xceed.Wpf.AvalonDock.Layout.LayoutRoot)(target));
-            return;
-            case 9:
-            this._openSourceScreenShot = ((System.Windows.Controls.Image)(target));
-            return;
-            case 10:
-            this._openSourceTextHyperlink = ((System.Windows.Controls.StackPanel)(target));
-            return;
-            case 11:
-            
-            #line 313 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.i.cs
deleted file mode 100644
index 034d4173..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.i.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "35C17E62EC5A6FCAC3D4DAED30DD19C7F6BBC224"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.AvalonDock;
-using Xceed.Wpf.AvalonDock.Controls;
-using Xceed.Wpf.AvalonDock.Converters;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Themes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingAvalonDockView
-    /// </summary>
-    public partial class ThemingAvalonDockView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 25 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingAvalonDockView _demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 121 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _themeCombo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 169 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem metroDarkComboBoxItem;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 176 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem metroLightComboBoxItem;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 194 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Border SampleBorder;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 196 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.DockingManager _dockingManager;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 211 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.Layout.LayoutRoot _layoutRoot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 309 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Image _openSourceScreenShot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 310 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.StackPanel _openSourceTextHyperlink;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingavalondock" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingAvalonDockView)(target));
-            return;
-            case 2:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this._themeCombo = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 4:
-            this.metroDarkComboBoxItem = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem)(target));
-            return;
-            case 5:
-            this.metroLightComboBoxItem = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem)(target));
-            return;
-            case 6:
-            this.SampleBorder = ((System.Windows.Controls.Border)(target));
-            return;
-            case 7:
-            this._dockingManager = ((Xceed.Wpf.AvalonDock.DockingManager)(target));
-            return;
-            case 8:
-            this._layoutRoot = ((Xceed.Wpf.AvalonDock.Layout.LayoutRoot)(target));
-            return;
-            case 9:
-            this._openSourceScreenShot = ((System.Windows.Controls.Image)(target));
-            return;
-            case 10:
-            this._openSourceTextHyperlink = ((System.Windows.Controls.StackPanel)(target));
-            return;
-            case 11:
-            
-            #line 313 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.baml
deleted file mode 100644
index 49e06a5d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.cs
deleted file mode 100644
index e579aa8b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "817B998ADF733508201A9FE809A7651EA52C2D46"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingCoreWPFView
-    /// </summary>
-    public partial class ThemingCoreWPFView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingcorewpfvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.i.cs
deleted file mode 100644
index e579aa8b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "817B998ADF733508201A9FE809A7651EA52C2D46"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingCoreWPFView
-    /// </summary>
-    public partial class ThemingCoreWPFView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingcorewpfvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.baml
deleted file mode 100644
index fe248c4d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.cs
deleted file mode 100644
index 8d343050..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FA74512DA66E62CADC6D0DD3067E440B8CA6D3A3"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingDataGridView
-    /// </summary>
-    public partial class ThemingDataGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 26 "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingDataGridView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingdatagridvi" +
-                    "ew.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingDataGridView)(target));
-            return;
-            case 2:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.i.cs
deleted file mode 100644
index 8d343050..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.i.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FA74512DA66E62CADC6D0DD3067E440B8CA6D3A3"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingDataGridView
-    /// </summary>
-    public partial class ThemingDataGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 26 "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingDataGridView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingdatagridvi" +
-                    "ew.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingDataGridView)(target));
-            return;
-            case 2:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.baml
deleted file mode 100644
index a78be8e9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.cs
deleted file mode 100644
index 6214c03d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "13799909F50AB8C1245CC79DD8B2B1F1FC4E55D8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingExtendedToolkitView
-    /// </summary>
-    public partial class ThemingExtendedToolkitView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 24 "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingExtendedToolkitView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingextendedto" +
-                    "olkitview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingExtendedToolkitView)(target));
-            return;
-            case 2:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.i.cs
deleted file mode 100644
index 6214c03d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.i.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "13799909F50AB8C1245CC79DD8B2B1F1FC4E55D8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingExtendedToolkitView
-    /// </summary>
-    public partial class ThemingExtendedToolkitView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 24 "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingExtendedToolkitView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingextendedto" +
-                    "olkitview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingExtendedToolkitView)(target));
-            return;
-            case 2:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.baml
deleted file mode 100644
index 90a5896f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.cs
deleted file mode 100644
index 6dcbc6be..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0F14F712321498B8682B879374B0D502200425F6"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingListBoxView
-    /// </summary>
-    public partial class ThemingListBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 26 "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingListBoxView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/theminglistboxvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingListBoxView)(target));
-            return;
-            case 2:
-            
-            #line 36 "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.i.cs
deleted file mode 100644
index 6dcbc6be..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.i.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0F14F712321498B8682B879374B0D502200425F6"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingListBoxView
-    /// </summary>
-    public partial class ThemingListBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 26 "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingListBoxView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/theminglistboxvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingListBoxView)(target));
-            return;
-            case 2:
-            
-            #line 36 "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.baml
deleted file mode 100644
index ee32e786..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.cs
deleted file mode 100644
index b24aebd2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4A4611646777B562AFBB7C7A9D9996353F66CCE4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimeSpan.Views {
-    
-    
-    /// <summary>
-    /// TimeSpanView
-    /// </summary>
-    public partial class TimeSpanView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 65 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _watermark;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 74 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _clipValuetoMinMax;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _showSeconds;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 94 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _fractionalSecondsDigitsCount;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 105 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _currentDateTimePart;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 118 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _defaultValue;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 130 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _minimum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 143 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _maximum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 156 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _step;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 174 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _timeSpanUpDown;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/timespan/views/timespanview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._watermark = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 2:
-            this._clipValuetoMinMax = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._showSeconds = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._fractionalSecondsDigitsCount = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 5:
-            this._currentDateTimePart = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 6:
-            this._defaultValue = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            case 7:
-            this._minimum = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            case 8:
-            this._maximum = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            case 9:
-            this._step = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 10:
-            this._timeSpanUpDown = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.i.cs
deleted file mode 100644
index b24aebd2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.i.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4A4611646777B562AFBB7C7A9D9996353F66CCE4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimeSpan.Views {
-    
-    
-    /// <summary>
-    /// TimeSpanView
-    /// </summary>
-    public partial class TimeSpanView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 65 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _watermark;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 74 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _clipValuetoMinMax;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _showSeconds;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 94 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _fractionalSecondsDigitsCount;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 105 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _currentDateTimePart;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 118 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _defaultValue;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 130 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _minimum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 143 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _maximum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 156 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _step;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 174 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _timeSpanUpDown;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/timespan/views/timespanview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._watermark = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 2:
-            this._clipValuetoMinMax = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._showSeconds = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._fractionalSecondsDigitsCount = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 5:
-            this._currentDateTimePart = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 6:
-            this._defaultValue = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            case 7:
-            this._minimum = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            case 8:
-            this._maximum = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            case 9:
-            this._step = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 10:
-            this._timeSpanUpDown = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.baml
deleted file mode 100644
index 02208f9a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.cs
deleted file mode 100644
index 9fabfd8c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "43A5F7E8C8DE1F7C2B7994C397DA94C719CA966C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimelinePanel.Views {
-    
-    
-    /// <summary>
-    /// TimelinePanelView
-    /// </summary>
-    public partial class TimelinePanelView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboOrientation;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 128 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboOverlap;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 131 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _keepOrder;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 135 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimelinePanel _panel;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/timelinepanel/views/timelinepan" +
-                    "elview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._cboOrientation = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 2:
-            this._cboOverlap = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 3:
-            this._keepOrder = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._panel = ((Xceed.Wpf.Toolkit.TimelinePanel)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.i.cs
deleted file mode 100644
index 9fabfd8c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.i.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "43A5F7E8C8DE1F7C2B7994C397DA94C719CA966C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimelinePanel.Views {
-    
-    
-    /// <summary>
-    /// TimelinePanelView
-    /// </summary>
-    public partial class TimelinePanelView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboOrientation;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 128 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboOverlap;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 131 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _keepOrder;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 135 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimelinePanel _panel;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/timelinepanel/views/timelinepan" +
-                    "elview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._cboOrientation = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 2:
-            this._cboOverlap = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 3:
-            this._keepOrder = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._panel = ((Xceed.Wpf.Toolkit.TimelinePanel)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.baml
deleted file mode 100644
index 24cd877d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.cs
deleted file mode 100644
index 77e45230..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "05845D13BC86D961F313D3780DCB5AF0BE102725"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Views {
-    
-    
-    /// <summary>
-    /// ToggleSwitchView
-    /// </summary>
-    public partial class ToggleSwitchView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/toggleswitch/views/toggleswitch" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.i.cs
deleted file mode 100644
index 77e45230..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.i.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "05845D13BC86D961F313D3780DCB5AF0BE102725"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Views {
-    
-    
-    /// <summary>
-    /// ToggleSwitchView
-    /// </summary>
-    public partial class ToggleSwitchView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/toggleswitch/views/toggleswitch" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.baml
deleted file mode 100644
index e1f1f0c2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.cs
deleted file mode 100644
index 2282f377..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B574E69DFCB4DB37E4E99C8E3986489F6F515A65"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views {
-    
-    
-    /// <summary>
-    /// WatermarkComboBoxView
-    /// </summary>
-    public partial class WatermarkComboBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 112 "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.WatermarkComboBox _watermarkComboBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/watermarkcombobox/views/waterma" +
-                    "rkcomboboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._watermarkComboBox = ((Xceed.Wpf.Toolkit.WatermarkComboBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.i.cs
deleted file mode 100644
index 2282f377..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.i.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B574E69DFCB4DB37E4E99C8E3986489F6F515A65"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views {
-    
-    
-    /// <summary>
-    /// WatermarkComboBoxView
-    /// </summary>
-    public partial class WatermarkComboBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 112 "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.WatermarkComboBox _watermarkComboBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/watermarkcombobox/views/waterma" +
-                    "rkcomboboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._watermarkComboBox = ((Xceed.Wpf.Toolkit.WatermarkComboBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/FancyStyles.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/FancyStyles.baml
deleted file mode 100644
index 8400bb82..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/FancyStyles.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.baml
deleted file mode 100644
index 6be8286a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.cs
deleted file mode 100644
index f67a3862..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C0FBE578166A21E44486A54EB31671E3C3EE0627"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources {
-    
-    
-    /// <summary>
-    /// WindowModelEditor
-    /// </summary>
-    public partial class WindowModelEditor : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 26 "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources.WindowModelEditor _windowModelEditor;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 89 "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _titleShadowBrushColorPicker;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/resources/windowmodeledi" +
-                    "tor.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._windowModelEditor = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources.WindowModelEditor)(target));
-            return;
-            case 2:
-            this._titleShadowBrushColorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.i.cs
deleted file mode 100644
index f67a3862..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.i.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C0FBE578166A21E44486A54EB31671E3C3EE0627"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources {
-    
-    
-    /// <summary>
-    /// WindowModelEditor
-    /// </summary>
-    public partial class WindowModelEditor : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 26 "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources.WindowModelEditor _windowModelEditor;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 89 "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _titleShadowBrushColorPicker;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/resources/windowmodeledi" +
-                    "tor.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._windowModelEditor = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources.WindowModelEditor)(target));
-            return;
-            case 2:
-            this._titleShadowBrushColorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.baml
deleted file mode 100644
index 8d63530a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.cs
deleted file mode 100644
index fb241112..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0D5A855F74AEC87D958C25FC29AB4B41DEFDF1A2"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views {
-    
-    
-    /// <summary>
-    /// ChildWindowView
-    /// </summary>
-    public partial class ChildWindowView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 78 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _txtCaption;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 80 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock textBlock2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 81 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _txtLeft;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 83 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock textBlock3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _txtTop;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 87 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _chkIsModal;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 90 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboWindowStartupLocations;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 93 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboWindowState;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 99 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _childWindow;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/views/childwindowview.xa" +
-                    "ml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._txtCaption = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this.textBlock2 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 4:
-            this._txtLeft = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 5:
-            this.textBlock3 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 6:
-            this._txtTop = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 7:
-            this._chkIsModal = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 8:
-            this._cboWindowStartupLocations = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 9:
-            this._cboWindowState = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 10:
-            this._childWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.i.cs
deleted file mode 100644
index fb241112..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.i.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0D5A855F74AEC87D958C25FC29AB4B41DEFDF1A2"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views {
-    
-    
-    /// <summary>
-    /// ChildWindowView
-    /// </summary>
-    public partial class ChildWindowView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 78 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _txtCaption;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 80 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock textBlock2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 81 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _txtLeft;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 83 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock textBlock3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _txtTop;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 87 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _chkIsModal;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 90 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboWindowStartupLocations;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 93 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboWindowState;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 99 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _childWindow;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/views/childwindowview.xa" +
-                    "ml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._txtCaption = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this.textBlock2 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 4:
-            this._txtLeft = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 5:
-            this.textBlock3 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 6:
-            this._txtTop = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 7:
-            this._chkIsModal = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 8:
-            this._cboWindowStartupLocations = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 9:
-            this._cboWindowState = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 10:
-            this._childWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.baml
deleted file mode 100644
index b33c59ae..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.cs
deleted file mode 100644
index 5bef453b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2B875AB5BA984A20829FE5BF94D9A4AFE4415FF8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views {
-    
-    
-    /// <summary>
-    /// StyleableWindowView
-    /// </summary>
-    public partial class StyleableWindowView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 120 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _enableStyleCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 154 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _childWindow;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/views/styleablewindowvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._enableStyleCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            
-            #line 120 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            this._enableStyleCheckBox.Click += new System.Windows.RoutedEventHandler(this.UpdateWindowsStyles);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 130 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StandardMessageBoxButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            
-            #line 131 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StyledMessageBoxButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            
-            #line 136 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OnStyleableWindow_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            this._childWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.i.cs
deleted file mode 100644
index 5bef453b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.i.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2B875AB5BA984A20829FE5BF94D9A4AFE4415FF8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views {
-    
-    
-    /// <summary>
-    /// StyleableWindowView
-    /// </summary>
-    public partial class StyleableWindowView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 120 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _enableStyleCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 154 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _childWindow;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/views/styleablewindowvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._enableStyleCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            
-            #line 120 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            this._enableStyleCheckBox.Click += new System.Windows.RoutedEventHandler(this.UpdateWindowsStyles);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 130 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StandardMessageBoxButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            
-            #line 131 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StyledMessageBoxButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            
-            #line 136 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OnStyleableWindow_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            this._childWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.baml
deleted file mode 100644
index c3e81559..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.cs
deleted file mode 100644
index 8c697b73..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0EDEFE87BC8FF1C960CFD3B0F15A4408534BF325"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views {
-    
-    
-    /// <summary>
-    /// WindowContainerView
-    /// </summary>
-    public partial class WindowContainerView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 64 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _modalBackgroundColorPicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 83 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _childWindowCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _modalChildWindowCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 85 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _messageBoxCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 123 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Primitives.WindowContainer _windowContainer;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _childWindow;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 135 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _modalChildWindow;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 146 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.MessageBox _messageBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/views/windowcontainervie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._modalBackgroundColorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 2:
-            this._childWindowCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._modalChildWindowCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._messageBoxCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            
-            #line 85 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            this._messageBoxCheckBox.Checked += new System.Windows.RoutedEventHandler(this.OnMessageBoxCheckBoxChecked);
-            
-            #line default
-            #line hidden
-            
-            #line 85 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            this._messageBoxCheckBox.Unchecked += new System.Windows.RoutedEventHandler(this.OnMessageBoxCheckBoxUnchecked);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            this._windowContainer = ((Xceed.Wpf.Toolkit.Primitives.WindowContainer)(target));
-            return;
-            case 6:
-            this._childWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            case 7:
-            this._modalChildWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            case 8:
-            this._messageBox = ((Xceed.Wpf.Toolkit.MessageBox)(target));
-            
-            #line 149 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            this._messageBox.Closed += new System.EventHandler(this.OnMessageBoxClose);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.i.cs
deleted file mode 100644
index 8c697b73..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.i.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0EDEFE87BC8FF1C960CFD3B0F15A4408534BF325"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views {
-    
-    
-    /// <summary>
-    /// WindowContainerView
-    /// </summary>
-    public partial class WindowContainerView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 64 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _modalBackgroundColorPicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 83 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _childWindowCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _modalChildWindowCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 85 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _messageBoxCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 123 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Primitives.WindowContainer _windowContainer;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _childWindow;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 135 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _modalChildWindow;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 146 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.MessageBox _messageBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/views/windowcontainervie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._modalBackgroundColorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 2:
-            this._childWindowCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._modalChildWindowCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._messageBoxCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            
-            #line 85 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            this._messageBoxCheckBox.Checked += new System.Windows.RoutedEventHandler(this.OnMessageBoxCheckBoxChecked);
-            
-            #line default
-            #line hidden
-            
-            #line 85 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            this._messageBoxCheckBox.Unchecked += new System.Windows.RoutedEventHandler(this.OnMessageBoxCheckBoxUnchecked);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            this._windowContainer = ((Xceed.Wpf.Toolkit.Primitives.WindowContainer)(target));
-            return;
-            case 6:
-            this._childWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            case 7:
-            this._modalChildWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            case 8:
-            this._messageBox = ((Xceed.Wpf.Toolkit.MessageBox)(target));
-            
-            #line 149 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            this._messageBox.Closed += new System.EventHandler(this.OnMessageBoxClose);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.baml
deleted file mode 100644
index 881f0276..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.cs
deleted file mode 100644
index 9e296960..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "891F27925C4AF4BE57D303EA8A4460F74E70962E"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Wizard.Views {
-    
-    
-    /// <summary>
-    /// WizardView
-    /// </summary>
-    public partial class WizardView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/wizard/views/wizardview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 29 "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml"
-            ((Xceed.Wpf.Toolkit.Wizard)(target)).Help += new System.Windows.RoutedEventHandler(this.OnWizardHelp);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            
-            #line 46 "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OnButtonClick);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.i.cs
deleted file mode 100644
index 9e296960..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.i.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "891F27925C4AF4BE57D303EA8A4460F74E70962E"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Wizard.Views {
-    
-    
-    /// <summary>
-    /// WizardView
-    /// </summary>
-    public partial class WizardView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/wizard/views/wizardview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 29 "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml"
-            ((Xceed.Wpf.Toolkit.Wizard)(target)).Help += new System.Windows.RoutedEventHandler(this.OnWizardHelp);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            
-            #line 46 "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OnButtonClick);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.baml
deleted file mode 100644
index f577eb0b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.cs
deleted file mode 100644
index 817850b7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3F9453594F4C4342B4FA4B7EB172B0F0282425E0"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Views {
-    
-    
-    /// <summary>
-    /// ZoomboxView
-    /// </summary>
-    public partial class ZoomboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 206 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider AccelerationSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 218 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider DecelerationSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 482 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Zoombox.Zoombox zoombox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/zoombox/views/zoomboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.AccelerationSlider = ((System.Windows.Controls.Slider)(target));
-            
-            #line 210 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            this.AccelerationSlider.ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.CoerceAnimationRatios);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.DecelerationSlider = ((System.Windows.Controls.Slider)(target));
-            
-            #line 222 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            this.DecelerationSlider.ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.CoerceAnimationRatios);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 235 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            ((System.Windows.Controls.Slider)(target)).ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.AdjustAnimationDuration);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this.zoombox = ((Xceed.Wpf.Toolkit.Zoombox.Zoombox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.i.cs
deleted file mode 100644
index 817850b7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.i.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3F9453594F4C4342B4FA4B7EB172B0F0282425E0"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Views {
-    
-    
-    /// <summary>
-    /// ZoomboxView
-    /// </summary>
-    public partial class ZoomboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 206 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider AccelerationSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 218 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider DecelerationSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 482 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Zoombox.Zoombox zoombox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/zoombox/views/zoomboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.AccelerationSlider = ((System.Windows.Controls.Slider)(target));
-            
-            #line 210 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            this.AccelerationSlider.ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.CoerceAnimationRatios);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.DecelerationSlider = ((System.Windows.Controls.Slider)(target));
-            
-            #line 222 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            this.DecelerationSlider.ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.CoerceAnimationRatios);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 235 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            ((System.Windows.Controls.Slider)(target)).ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.AdjustAnimationDuration);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this.zoombox = ((Xceed.Wpf.Toolkit.Zoombox.Zoombox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources
deleted file mode 100644
index 6c05a977..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources
deleted file mode 100644
index c27ca56f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources
deleted file mode 100644
index c5068ba1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.application b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
deleted file mode 100644
index 85f8d7ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.application" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="Xceed Software Inc." asmv2:product="Xceed Toolkit Plus for WPF LiveExplorer" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="true" mapFileExtensions="true" />
-  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.0" profile="Client" supportedRuntime="4.0.30319" />
-    <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
-  </compatibleFrameworks>
-  <dependency>
-    <dependentAssembly dependencyType="install" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest" size="17174">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>ob1xtL0NFoBuWOm6eWhtN/R2wCI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
deleted file mode 100644
index 42313f94..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,239 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe.config
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.application
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.DataGrid.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Samples.SampleData.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.DataGrid.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Resources\LiveExplorerScrollViewer.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Resources\TextBlockStyles.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Resources\Common.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Resources\CommonResources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Resources\LastNameUserControlEditor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\ItemTemplates\Common.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Resources\FancyStyles.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Resources\WindowModelEditor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\App.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\HomeView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\MainWindow.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\AvalonDock\Views\AvalonDockView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\IconButtonView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\ButtonSpinnerView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\DropDownSplitButtonView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Calculator\Views\CalculatorView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartAxisView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartLegendView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesBasicTypesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesDataPointsBindingView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingAxesGridView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingColumnSeriesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingLineSeriesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingPieSeriesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\CheckLists\Views\CheckListsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Color\Views\ColorView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\DataGridView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\MultiColumnComboBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DateTime\Views\DateTimeView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\FilePicker\Views\FilePickerView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Gauge\Views\RadialGaugeView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ListBox\Views\ListBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Magnifier\Views\MagnifierView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialHamburgerView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialComboBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialListBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToolTipView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialDropDownView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSwitchView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialFrameView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTabsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarCircularView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialRadioButtonView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialCheckBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToastView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSliderView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTextFieldView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialButtonView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialControlsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MultiCalendar\Views\MultiCalendarView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Numeric\Views\NumericView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Panels\Views\SwitchPanelView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieChartView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieProgressView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PileFlowPanel\Views\PileFlowPanelView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Resources\LastNameUserControlEditor.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridAttributesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\RangeSlider\Views\RangeSliderView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Rating\Views\RatingView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\SlideShow\Views\SlideShowView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\AutoSelectTextboxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MaskedTextboxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MultiLineTextEditorView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\RichTextboxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkPasswordBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkTextboxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingAvalonDockView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingCoreWPFView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingDataGridView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingExtendedToolkitView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingListBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimelinePanel\Views\TimelinePanelView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimeSpan\Views\TimeSpanView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ToggleSwitch\Views\ToggleSwitchView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\TokenizedTextBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Resources\WindowModelEditor.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\ChildWindowView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\StyleableWindowView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\WindowContainerView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Wizard\Views\WizardView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Zoombox\Views\ZoomboxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\App.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\HomeView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\MainWindow.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\AvalonDock\Views\AvalonDockView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\IconButtonView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\ButtonSpinnerView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\DropDownSplitButtonView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Calculator\Views\CalculatorView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartAxisView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartLegendView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesBasicTypesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesDataPointsBindingView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingAxesGridView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingColumnSeriesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingLineSeriesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingPieSeriesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\CheckLists\Views\CheckListsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Color\Views\ColorView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\DataGridView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\MultiColumnComboBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DateTime\Views\DateTimeView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\FilePicker\Views\FilePickerView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Gauge\Views\RadialGaugeView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ListBox\Views\ListBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Magnifier\Views\MagnifierView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialHamburgerView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialComboBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialListBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToolTipView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialDropDownView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSwitchView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialFrameView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTabsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarCircularView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialRadioButtonView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialCheckBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToastView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSliderView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTextFieldView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialButtonView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialControlsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MultiCalendar\Views\MultiCalendarView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Numeric\Views\NumericView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Panels\Views\SwitchPanelView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieChartView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieProgressView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PileFlowPanel\Views\PileFlowPanelView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridAttributesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\RangeSlider\Views\RangeSliderView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Rating\Views\RatingView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\SlideShow\Views\SlideShowView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\AutoSelectTextboxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MaskedTextboxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MultiLineTextEditorView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\RichTextboxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkPasswordBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkTextboxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingAvalonDockView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingCoreWPFView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingDataGridView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingExtendedToolkitView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingListBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimelinePanel\Views\TimelinePanelView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimeSpan\Views\TimeSpanView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ToggleSwitch\Views\ToggleSwitchView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\TokenizedTextBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\ChildWindowView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\StyleableWindowView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\WindowContainerView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Wizard\Views\WizardView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Zoombox\Views\ZoomboxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.application
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
deleted file mode 100644
index df3d3358..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-  <description asmv2:iconFile="App.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <application />
-  <entryPoint>
-    <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-    <commandLine file="Xceed.Wpf.Toolkit.LiveExplorer.exe" parameters="" />
-  </entryPoint>
-  <trustInfo>
-    <security>
-      <applicationRequestMinimum>
-        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-      </applicationRequestMinimum>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-            If you want to change the Windows User Account Control level replace the 
-            requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel node will disable file and registry virtualization.
-            If you want to utilize File and Registry Virtualization for backward 
-            compatibility then delete the requestedExecutionLevel node.
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentOS>
-      <osVersionInfo>
-        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
-      </osVersionInfo>
-    </dependentOS>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.dll" size="427008">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fJ+tiQsbOQwfGd3itpkyUquu3RA=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="de\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="de" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>iK9HDffv2Q6qrh3sPkrXxIxhPYQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="es\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="es" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>5BfdaqLid+/kyJCQX52bEt2rEU8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>FmHDLfKoQyzMD6VzydX31KxFVwQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="hu\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="hu" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>HysaXhpNt3jXo9+ZbwTHhmqc/ZI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="it\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="it" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>wWS+24oJwFk6HrRmBg5TmTuOSrI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="pt-BR\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="pt-BR" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fLJrmg3/6gkuHVpvm48rHU0PQu8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ro\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ro" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>APZdP9nOSFv9/VEayZ7e1u3YQwg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ru\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ru" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dSmBWR4oV60hXzMEcu5Pzv78324=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="sv" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>v9u0pYRMOsstuMutmXdyhxwVSoE=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="zh-Hans" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>aLiV5N9DeMFHFId42Hauinb7z10=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Aero.dll" size="87040">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Aero" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>pHMnOAZhLdiVxLW8WVr7oKSNvzc=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="79872">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>6HW2YrRgZzx55mSInWqY5G2Rmtg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="84480">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dk2/e/lvOlxMqaSBa7vwkuVMmWY=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="2435584">
-      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>K9KOIk/JBcp0My6g71prOBaVSso=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Samples.SampleData.dll" size="2506240">
-      <assemblyIdentity name="Xceed.Wpf.Samples.SampleData" version="2.0.13161.5" publicKeyToken="BA83FF368B7563C6" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>h7GeHgNOmosQ3JAdBzkZH1g8UZs=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.dll" size="1104384">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>rzSCAw1wGgE9FFQGxPlp62E0H3E=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16285184">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>e/H+bvBidZ6C9yzoGNEGVxWvT3Q=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll" size="5632">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.resources" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>vsLAPrssl9QqQjMJSoMqV2acKVI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <file name="App.ico" size="31356">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>+gOYudfK6KDh/6TPnBz61fPTSDc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <file name="Xceed.Wpf.Toolkit.LiveExplorer.exe.config" size="1186">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>I+4TtxHlXRDLuy+spjHIoJq5EXc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
-      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
-    </application>
-  </compatibility>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.g.resources
deleted file mode 100644
index 879e99ca..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
deleted file mode 100644
index 11307a15..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
+++ /dev/null
@@ -1,95 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\HomeView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\MainWindow.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\AvalonDock\Views\AvalonDockView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\IconButtonView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\ButtonSpinnerView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\DropDownSplitButtonView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Calculator\Views\CalculatorView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartAxisView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartLegendView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingAxesGridView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingLineSeriesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingPieSeriesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\CheckLists\Views\CheckListsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Color\Views\ColorView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DataGrid\Views\DataGridView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DateTime\Views\DateTimeView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\FilePicker\Views\FilePickerView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Gauge\Views\RadialGaugeView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\ListBox\Views\ListBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Magnifier\Views\MagnifierView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialHamburgerView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialComboBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialListBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialToolTipView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialDropDownView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialSwitchView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialFrameView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialTabsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialProgressBarView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialToastView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialSliderView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialTextFieldView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialButtonView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialControlsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MultiCalendar\Views\MultiCalendarView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Numeric\Views\NumericView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Panels\Views\SwitchPanelView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieChartView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieProgressView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\RangeSlider\Views\RangeSliderView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Rating\Views\RatingView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\SlideShow\Views\SlideShowView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\AutoSelectTextboxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\MaskedTextboxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\MultiLineTextEditorView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\RichTextboxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\WatermarkPasswordBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\WatermarkTextboxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingAvalonDockView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingCoreWPFView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingDataGridView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingExtendedToolkitView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingListBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\TimelinePanel\Views\TimelinePanelView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\TimeSpan\Views\TimeSpanView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\TokenizedTextBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\ChildWindowView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\StyleableWindowView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\WindowContainerView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Wizard\Views\WizardView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Zoombox\Views\ZoomboxView.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
index c6ea985d..2c57bb8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
@@ -21,7 +21,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "3.4";
+  public const string BaseVersion = "3.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
index 4047e312..e0261713 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
@@ -77,7 +77,8 @@
 
   <ControlTemplate x:Key="VerticalSlideThumbTemplate"
                    TargetType="{x:Type Thumb}">
-    <Canvas SnapsToDevicePixels="true">
+    <Canvas SnapsToDevicePixels="true"
+            Background="Transparent">
       <Path x:Name="LeftArrow"
             Stretch="Fill"
             StrokeLineJoin="Round"
@@ -89,11 +90,7 @@
             Height="8">
         <Path.RenderTransform>
           <TransformGroup>
-            <ScaleTransform />
-            <SkewTransform />
-            <RotateTransform />
-            <TranslateTransform Y="6"
-                                X="-3" />
+            <TranslateTransform Y="6" />
           </TransformGroup>
         </Path.RenderTransform>
       </Path>
@@ -108,11 +105,9 @@
             Height="8">
         <Path.RenderTransform>
           <TransformGroup>
-            <ScaleTransform />
-            <SkewTransform />
             <RotateTransform Angle="-180" />
             <TranslateTransform Y="6"
-                                X="8" />
+                                X="9" />
           </TransformGroup>
         </Path.RenderTransform>
       </Path>
@@ -128,7 +123,7 @@
     <Setter Property="Height"
             Value="12" />
     <Setter Property="Width"
-            Value="11" />
+            Value="15" />
     <Setter Property="Foreground"
             Value="Gray" />
     <Setter Property="Template"
@@ -178,6 +173,8 @@
             Value="DarkGray" />
     <Setter Property="BorderThickness"
             Value="1" />
+    <Setter Property="SmallChange"
+            Value="10" />
     <Setter Property="Orientation"
             Value="Vertical" />
     <Setter Property="Background"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
index 2c9d81f4..caf67169 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
@@ -164,13 +164,14 @@
     <Setter Property="Height"
             Value="12" />
     <Setter Property="Width"
-            Value="11" />
+            Value="15" />
     <Setter Property="Foreground"
             Value="Gray" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type Thumb}">
-          <Canvas SnapsToDevicePixels="true">
+          <Canvas SnapsToDevicePixels="true"
+                  Background="Transparent">
             <Path x:Name="LeftArrow"
                   Stretch="Fill"
                   StrokeLineJoin="Round"
@@ -182,11 +183,7 @@
                   Height="8">
               <Path.RenderTransform>
                 <TransformGroup>
-                  <ScaleTransform />
-                  <SkewTransform />
-                  <RotateTransform />
-                  <TranslateTransform Y="6"
-                                      X="-3" />
+                  <TranslateTransform Y="6" />
                 </TransformGroup>
               </Path.RenderTransform>
             </Path>
@@ -201,11 +198,9 @@
                   Height="8">
               <Path.RenderTransform>
                 <TransformGroup>
-                  <ScaleTransform />
-                  <SkewTransform />
                   <RotateTransform Angle="-180" />
                   <TranslateTransform Y="6"
-                                      X="8" />
+                                      X="9" />
                 </TransformGroup>
               </Path.RenderTransform>
             </Path>
@@ -559,6 +554,8 @@
             Value="DarkGray" />
     <Setter Property="BorderThickness"
             Value="1" />
+    <Setter Property="SmallChange"
+            Value="10" />
     <Setter Property="Orientation"
             Value="Vertical" />
     <Setter Property="Background"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
index ca5926c0..cbea59b8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
@@ -211,11 +211,13 @@
             Value="0" />
     <Setter Property="MaxHeight"
             Value="500" />
+    <!-- ConverterParameter is margin/Padding from Popup-->
+    <Setter Property="Width"
+            Value="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}"/>
     <Setter Property="ItemsPanel">
       <Setter.Value>
         <ItemsPanelTemplate>
-          <!-- ConverterParameter is margin/Padding from Popup-->
-          <WrapPanel Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
+          <WrapPanel Width="{Binding ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}, Converter={StaticResource AdditionConverter}, ConverterParameter=-4}" />
         </ItemsPanelTemplate>
       </Setter.Value>
     </Setter>
@@ -291,7 +293,7 @@
     <Setter Property="VerticalContentAlignment"
             Value="Center" />
     <Setter Property="MaxDropDownWidth"
-            Value="218" />
+            Value="250" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type local:ColorPicker}">
@@ -339,7 +341,8 @@
                    HorizontalOffset="1"
                    VerticalOffset="1"
                    PopupAnimation="Slide"
-                   ToolTip="{x:Static sys:String.Empty}">
+                   ToolTip="{x:Static sys:String.Empty}"
+                   Width="{TemplateBinding MaxDropDownWidth}">
               <Popup.Resources>
                 <Style TargetType="ToolTip">
                   <Style.Triggers>
@@ -439,12 +442,16 @@
                                             Header="{Binding AdvancedButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
                                             Template="{StaticResource TabItemTemplate}">
                     <!-- ColorCanvas -->
-                    <Grid x:Name="_colorCanvasHost">
+                    <!-- ConverterParameter is margin/Padding from Popup-->
+                    <Grid x:Name="_colorCanvasHost"
+                          Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}">
+                      <ScrollViewer HorizontalScrollBarVisibility="Auto"
+                                    VerticalScrollBarVisibility="Hidden">                        
                       <local:ColorCanvas Background="Transparent"
                                          BorderThickness="0"
                                          UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}"
-                                         Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
+                                         SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                      </ScrollViewer>
                     </Grid>
                   </local:ColorPickerTabItem>
                 </TabControl>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
index aa31e288..45a41ad6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
@@ -251,11 +251,13 @@
             Value="0" />
     <Setter Property="MaxHeight"
             Value="500" />
+    <!-- ConverterParameter is margin/Padding from Popup-->
+    <Setter Property="Width"
+            Value="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
     <Setter Property="ItemsPanel">
       <Setter.Value>
         <ItemsPanelTemplate>
-          <!-- ConverterParameter is margin/Padding from Popup-->
-          <WrapPanel Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
+          <WrapPanel Width="{Binding ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}, Converter={StaticResource AdditionConverter}, ConverterParameter=-4}" />
         </ItemsPanelTemplate>
       </Setter.Value>
     </Setter>
@@ -325,7 +327,7 @@
     <Setter Property="VerticalContentAlignment"
             Value="Center" />
     <Setter Property="MaxDropDownWidth"
-            Value="218" />
+            Value="250" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type local:ColorPicker}">
@@ -373,7 +375,8 @@
                    HorizontalOffset="1"
                    VerticalOffset="1"
                    PopupAnimation="Slide"
-                   ToolTip="{x:Static sys:String.Empty}">
+                   ToolTip="{x:Static sys:String.Empty}"
+                   Width="{TemplateBinding MaxDropDownWidth}">
               <Popup.Resources>
                 <Style TargetType="ToolTip">
                   <Style.Triggers>
@@ -473,12 +476,16 @@
                                             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}" />
+                    <!-- ConverterParameter is margin/Padding from Popup-->
+                    <Grid x:Name="_colorCanvasHost"
+                          Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}">
+                      <ScrollViewer HorizontalScrollBarVisibility="Auto"
+                                    VerticalScrollBarVisibility="Hidden">
+                        <local:ColorCanvas Background="Transparent"
+                                           BorderThickness="0"
+                                           UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
+                                           SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                      </ScrollViewer>
                     </Grid>
                   </local:ColorPickerTabItem>
                 </TabControl>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
index 344516f9..70da1c54 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -20,6 +20,7 @@ using System.Windows;
 using Xceed.Wpf.Toolkit.Primitives;
 using System.Windows.Controls;
 using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Windows.Input;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -663,6 +664,17 @@ namespace Xceed.Wpf.Toolkit
       throw new NotSupportedException( "DateTimeUpDown controls do not support modifying UpdateValueOnEnterKey property." );
     }
 
+    protected override void OnKeyDown( KeyEventArgs e )
+    {
+      if( e.Key == Key.Escape )
+      {
+        this.SyncTextAndValueProperties( false, null );
+        e.Handled = true;
+      }
+
+      base.OnKeyDown( e );
+    }
+
 
 #endregion //Base Class Overrides
 
@@ -710,6 +722,8 @@ namespace Xceed.Wpf.Toolkit
       if( currentValue.HasValue )
       {
         var newValue = this.UpdateDateTime( currentValue, step );
+        if( newValue == null )
+          return;
         this.TextBox.Text = newValue.Value.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
       }
       else
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
index f9c7932a..1164ec0b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -1455,9 +1455,7 @@ namespace Xceed.Wpf.Toolkit
 
     internal override bool GetIsEditTextEmpty()
     {
-      if( !m_maskIsNull )
-        return ( this.MaskedTextProvider.AssignedEditPositionCount == 0 );
-      return true;
+      return ( this.MaskedTextProvider.AssignedEditPositionCount == 0 );
     }
 
     #endregion INTERNAL PROPERTIES
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
index 5c98eac3..0bc1c62b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
@@ -220,7 +220,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
     protected virtual void PerformMouseSelection()
     {
       var dateTimeInfo = this.GetDateTimeInfo( TextBox.SelectionStart );
-      if( (dateTimeInfo != null) && (dateTimeInfo.Type == DateTimePart.Other) )
+      if( (this.TextBox is MaskedTextBox) && ( dateTimeInfo != null) && (dateTimeInfo.Type == DateTimePart.Other) )
       {
         this.Dispatcher.BeginInvoke( DispatcherPriority.Background, new Action( () =>
         {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
index e1c31a8f..32e699ee 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
@@ -16,6 +16,8 @@
 
 using System;
 using System.Globalization;
+using System.Windows;
+using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
@@ -38,8 +40,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
       var editorIsReadOnlyPropertyInfo = editorType.GetProperty( "IsReadOnly" );
       if( editorIsReadOnlyPropertyInfo != null )
       {
-        // Set Editor.IsReadOnly to PropertyGrid.IsReadOnly.
-        editorIsReadOnlyPropertyInfo.SetValue( editor, isReadOnly, null );
+        if( !this.IsPropertySetLocally( editor, TextBoxBase.IsReadOnlyProperty )  )
+        {
+          // Set Editor.IsReadOnly to PropertyGrid.IsReadOnly.
+          editorIsReadOnlyPropertyInfo.SetValue( editor, isReadOnly, null );
+        }
       }
       // No Editor.IsReadOnly property, set the Editor.IsEnabled property.
       else
@@ -47,8 +52,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
         var editorIsEnabledPropertyInfo = editorType.GetProperty( "IsEnabled" );
         if( editorIsEnabledPropertyInfo != null )
         {
-          // Set Editor.IsEnabled to !PropertyGrid.IsReadOnly.
-          editorIsEnabledPropertyInfo.SetValue( editor, !isReadOnly, null );
+          if( !this.IsPropertySetLocally( editor, UIElement.IsEnabledProperty ) )
+          {
+            // Set Editor.IsEnabled to !PropertyGrid.IsReadOnly.
+            editorIsEnabledPropertyInfo.SetValue( editor, !isReadOnly, null );
+          }
         }
       }
 
@@ -59,5 +67,21 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
     {
       throw new NotImplementedException();
     }
+
+    private bool IsPropertySetLocally( object editor, DependencyProperty dp )
+    {
+      if( dp == null )
+        return false;
+
+      var editorObject = editor as DependencyObject;
+      if( editorObject == null )
+        return false;
+
+      var valueSource = DependencyPropertyHelper.GetValueSource( editorObject, dp );
+      if( valueSource == null )
+        return false;
+
+      return ( valueSource.BaseValueSource == BaseValueSource.Local );
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
index 0550f466..b60c0140 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
@@ -43,7 +43,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     private object _selectedObject;
     private PropertyDescriptor _propertyDescriptor;
     private DependencyPropertyDescriptor _dpDescriptor;
-    private MarkupObject _markupObject;
 
     #endregion
 
@@ -136,7 +135,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     protected override object ComputeAdvancedOptionsTooltip()
     {
       object tooltip;
-      UpdateAdvanceOptionsForItem( _markupObject, SelectedObject as DependencyObject, _dpDescriptor, out tooltip );
+      UpdateAdvanceOptionsForItem( SelectedObject as DependencyObject, _dpDescriptor, out tooltip );
 
       return tooltip;
     }
@@ -254,7 +253,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       _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
index de0d2030..e656b7fc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
@@ -157,21 +157,16 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       return null;
     }
 
-    internal void UpdateAdvanceOptionsForItem( MarkupObject markupObject, DependencyObject dependencyObject, DependencyPropertyDescriptor dpDescriptor,
-                                                out object tooltip )
+    internal void UpdateAdvanceOptionsForItem( 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 );
-      }
+      //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( this.PropertyType );
+      isDynamicResource = typeof( DynamicResourceExtension ).IsAssignableFrom( this.PropertyType );
 
       if( isResource || isDynamicResource )
       {
@@ -214,30 +209,27 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
         else
         {
           // When the Value is diferent from the DefaultValue, use the local icon.
-          if( markupProperty != null && !markupProperty.Value.Equals( this.DefaultValue ) )
+          if( !this.Value.Equals( this.DefaultValue ) )
           {
             if( this.DefaultValue != null )
             {
-              if( !markupProperty.Value.Equals( this.DefaultValue ) )
-              {
-                tooltip = StringConstants.Local;
-              }
+              tooltip = StringConstants.Local;
             }
             else
             {
-              if( markupProperty.PropertyType.IsValueType )
+              if( this.PropertyType.IsValueType )
               {
-                var defaultValue = Activator.CreateInstance( markupProperty.PropertyType );
+                var defaultValue = Activator.CreateInstance( this.PropertyType );
                 // When the Value is diferent from the DefaultValue, use the local icon.
-                if( !markupProperty.Value.Equals( defaultValue ) )
+                if( !this.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) )
+                // When the Value is diferent from null, use the local icon.
+                if( this.Value != null )
                 {
                   tooltip = StringConstants.Local;
                 }
@@ -689,8 +681,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       _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/ObjectContainerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
index ded4a44d..2cff8874 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
@@ -51,7 +51,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       return ( selectedObject != null ) ? ObjectContainerHelperBase.GetDefaultPropertyName( SelectedObject ) : ( string )null;
     }
 
-    protected override IEnumerable<PropertyItem> GenerateSubPropertiesCore()
+    protected override void GenerateSubPropertiesCore( Action<IEnumerable<PropertyItem>> updatePropertyItemsCallback )
     {
       var propertyItems = new List<PropertyItem>();
 
@@ -114,7 +114,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
         }
       }
 
-      return propertyItems;
+      updatePropertyItemsCallback.Invoke( propertyItems );
     }
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
index 52a29bf2..ea845d02 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
@@ -29,6 +29,7 @@ using System.Collections;
 using System.Collections.ObjectModel;
 using System.Windows.Controls.Primitives;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using System.Windows.Controls;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
@@ -239,12 +240,15 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     protected abstract string GetDefaultPropertyName();
 
-    protected abstract IEnumerable<PropertyItem> GenerateSubPropertiesCore();
+    protected abstract void GenerateSubPropertiesCore( Action<IEnumerable<PropertyItem>> updatePropertyItemsCallback );
 
     private void RegenerateProperties()
     {
-      IEnumerable<PropertyItem> subProperties = this.GenerateSubPropertiesCore();
+      this.GenerateSubPropertiesCore( this.UpdatePropertyItemsCallback );
+    }
 
+    private void UpdatePropertyItemsCallback( IEnumerable<PropertyItem> subProperties )
+    {
       foreach( var propertyItem in subProperties )
       {
         this.InitializePropertyItem( propertyItem );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
index ff4ee52a..7127af89 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
@@ -1143,11 +1143,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
 
 
-      if( SelectedObject != null )
-      {
-        _containerHelper = new ObjectContainerHelper( this, SelectedObject );
-        ( ( ObjectContainerHelper )_containerHelper ).GenerateProperties();
-      }
+      _containerHelper = new ObjectContainerHelper( this, SelectedObject );
+      ( ( ObjectContainerHelper )_containerHelper ).GenerateProperties();
 
 
       if( _containerHelper != null )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
index 40528354..ea9018f2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
@@ -121,7 +121,8 @@ namespace Xceed.Wpf.Toolkit
     /// Get/Set the Brush for the Range between Higher and Maximum values. (Brush)
     /// </summary>
 
-    public static readonly DependencyProperty HigherRangeBackgroundProperty = DependencyProperty.Register( "HigherRangeBackground", typeof( Brush ), typeof( RangeSlider ) );
+    public static readonly DependencyProperty HigherRangeBackgroundProperty = DependencyProperty.Register( "HigherRangeBackground", typeof( Brush ), typeof( RangeSlider )
+      , new FrameworkPropertyMetadata( Brushes.Transparent ) );
 
     public Brush HigherRangeBackground
     {
@@ -304,7 +305,8 @@ namespace Xceed.Wpf.Toolkit
     /// Get/Set the Brush for the Range between Minimum and Lower values. (Brush)
     /// </summary>
 
-    public static readonly DependencyProperty LowerRangeBackgroundProperty = DependencyProperty.Register( "LowerRangeBackground", typeof( Brush ), typeof( RangeSlider ) );
+    public static readonly DependencyProperty LowerRangeBackgroundProperty = DependencyProperty.Register( "LowerRangeBackground", typeof( Brush ), typeof( RangeSlider )
+      , new FrameworkPropertyMetadata( Brushes.Transparent ) );
 
     public Brush LowerRangeBackground
     {
@@ -552,7 +554,8 @@ namespace Xceed.Wpf.Toolkit
     /// Get/Set the Brush for the Range between Lower and Higher values [active state]. (Brush)
     /// </summary>
 
-    public static readonly DependencyProperty RangeBackgroundProperty = DependencyProperty.Register( "RangeBackground", typeof( Brush ), typeof( RangeSlider ) );
+    public static readonly DependencyProperty RangeBackgroundProperty = DependencyProperty.Register( "RangeBackground", typeof( Brush ), typeof( RangeSlider )
+      , new FrameworkPropertyMetadata( Brushes.Transparent ) );
 
     public Brush RangeBackground
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
index 1b3c53d9..5b8a9752 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
@@ -204,31 +204,19 @@ namespace Xceed.Wpf.Toolkit
     {
       Point mousePosition = Mouse.GetPosition( _richTextBox );
 
-      var left = mousePosition.X;
-      var top = mousePosition.Y;
+      double left = mousePosition.X;
+      double top = ( mousePosition.Y - 15 ) - adorningEditor.ActualHeight;
 
-      // Top boundary
+      //top
       if( top < 0 )
       {
-        top = 5d;
+        top = mousePosition.Y + 10;
       }
 
-      // Left boundary
-      if( left < 0 )
+      //right boundary
+      if( left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 20 )
       {
-        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;
+        left = left - ( adorningEditor.ActualWidth - ( _richTextBox.ActualWidth - left ) );
       }
 
       _adorner.SetOffsets( left, top );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
index e541166f..e6a4681e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
@@ -58,7 +58,8 @@
                 SnapsToDevicePixels="True">
             <chrome:ButtonChrome x:Name="ControlChrome"
                                  Background="{TemplateBinding Background}"
-                                 RenderEnabled="{TemplateBinding IsEnabled}">
+                                 RenderEnabled="{TemplateBinding IsEnabled}"
+                                 BorderThickness="0">
               <Grid>
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="*" />
@@ -96,7 +97,6 @@
                 </Button>
                 <ToggleButton x:Name="PART_ToggleButton"
                               Grid.Column="1"
-                              IsTabStop="False"
                               IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                               IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
                   <ToggleButton.Template>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
index 7791fcf0..1e2d1b8e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
@@ -83,7 +83,8 @@
             <chrome:ButtonChrome x:Name="ControlChrome"
                                  Background="{TemplateBinding Background}"
                                  RenderEnabled="{TemplateBinding IsEnabled}"
-                                 CornerRadius="2.75">
+                                 CornerRadius="2.75"
+                                 BorderThickness="0">
               <Grid>
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="*" />
@@ -122,7 +123,6 @@
                 </Button>
                 <ToggleButton x:Name="PART_ToggleButton"
                               Grid.Column="1"
-                              IsTabStop="False"
                               IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                               IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
                   <ToggleButton.Template>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
index 49629d6f..9dca743c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
@@ -80,15 +80,40 @@ namespace Xceed.Wpf.Toolkit
 
     protected virtual void OnFractionalSecondsDigitsCountChanged( int oldValue, int newValue )
     {
-      var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-      this.SyncTextAndValueProperties( false, this.Text );
+      this.UpdateValue();
     }
 
     #endregion //FractionalSecondsDigitsCount
 
+    #region ShowDays
+
+    public static readonly DependencyProperty ShowDaysProperty = DependencyProperty.Register( "ShowDays", typeof( bool ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( true, OnShowDaysChanged ) );
+    public bool ShowDays
+    {
+      get
+      {
+        return (bool)GetValue( ShowDaysProperty );
+      }
+      set
+      {
+        SetValue( ShowDaysProperty, value );
+      }
+    }
+
+    private static void OnShowDaysChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      var timeSpanUpDown = o as TimeSpanUpDown;
+      if( timeSpanUpDown != null )
+        timeSpanUpDown.OnShowDaysChanged( (bool)e.OldValue, (bool)e.NewValue );
+    }
+
+    protected virtual void OnShowDaysChanged( bool oldValue, bool newValue )
+    {
+      this.UpdateValue();
+    }
+
+    #endregion //ShowDays
+
     #region ShowSeconds
 
     public static readonly DependencyProperty ShowSecondsProperty = DependencyProperty.Register( "ShowSeconds", typeof( bool ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( true, OnShowSecondsChanged ) );
@@ -113,11 +138,7 @@ namespace Xceed.Wpf.Toolkit
 
     protected virtual void OnShowSecondsChanged( bool oldValue, bool newValue )
     {
-      var value = this.UpdateValueOnEnterKey
-                  ? ( this.TextBox != null ) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-      this.SyncTextAndValueProperties( false, this.Text );
+      this.UpdateValue();
     }
 
     #endregion //ShowSeconds
@@ -166,7 +187,7 @@ namespace Xceed.Wpf.Toolkit
       if( this.Value == null )
         return string.Empty;
 
-      return this.ParseValueIntoTimeSpanInfo( this.Value );
+      return this.ParseValueIntoTimeSpanInfo( this.Value, true );
     }
 
     protected override TimeSpan? ConvertTextToValue( string text )
@@ -174,7 +195,30 @@ namespace Xceed.Wpf.Toolkit
       if( string.IsNullOrEmpty( text ) )
         return null;
 
-      TimeSpan timeSpan = TimeSpan.Parse( text );
+      var timeSpan = TimeSpan.MinValue;
+      if( this.ShowDays )
+      {
+        timeSpan = TimeSpan.Parse( text );
+      }
+      else
+      {
+        var separators = text.Where( x => x == ':' || x == '.' ).ToList();
+        var values = text.Split( new char[] { ':', '.' } );
+        if( ( values.Count() >= 2 ) && !values.Any( x => string.IsNullOrEmpty( x ) ) )
+        {
+          bool haveMS = ( separators.Count() > 1 ) && ( separators.Last() == '.' );
+
+          timeSpan = new TimeSpan( 0,  //Days
+                                   int.Parse( values[ 0 ].Replace("-", "") ),  //Hours
+                                   int.Parse( values[ 1 ].Replace( "-", "" ) ),  //Minutes
+                                   this.ShowSeconds ? int.Parse( values[ 2 ].Replace( "-", "" ) ) : 0,  //Seconds
+                                   haveMS ? int.Parse( values.Last().Replace( "-", "" ) ) : 0 );  //Milliseconds
+          if( text.StartsWith( "-" ) )
+          {
+            timeSpan = timeSpan.Negate();
+          }
+        }
+      }
 
       if( this.ClipValueToMinMax )
       {
@@ -291,36 +335,39 @@ namespace Xceed.Wpf.Toolkit
         }
       }
 
-      if( value.HasValue && value.Value.Days != 0 )
+      if( this.ShowDays )
       {
-        int dayLength = Math.Abs( value.Value.Days ).ToString().Length;
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Day, Length = dayLength, Format = "dd" } );
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ".", IsReadOnly = true } );
-
-        if( this.TextBox != null )
+        if( value.HasValue && value.Value.Days != 0 )
         {
-          //number of digits for days has changed when selection is not on date part, move TextBox.Selection to keep it on current DateTimeInfo
-          if( hasDay && (dayLength != lastDayInfo.Length) && (_selectedDateTimeInfo.Type != DateTimePart.Day) )
-          {
-            _fireSelectionChangedEvent = false;
-            this.TextBox.SelectionStart = Math.Max( 0, this.TextBox.SelectionStart + (dayLength - lastDayInfo.Length) );
-            _fireSelectionChangedEvent = true;
-          }
-          // Day has been added, move TextBox.Selection to keep it on current DateTimeInfo
-          else if( !hasDay )
+          int dayLength = Math.Abs( value.Value.Days ).ToString().Length;
+          _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Day, Length = dayLength, Format = "dd" } );
+          _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ".", IsReadOnly = true } );
+
+          if( this.TextBox != null )
           {
-            _fireSelectionChangedEvent = false;
-            this.TextBox.SelectionStart += (dayLength + 1);
-            _fireSelectionChangedEvent = true;
+            //number of digits for days has changed when selection is not on date part, move TextBox.Selection to keep it on current DateTimeInfo
+            if( hasDay && ( dayLength != lastDayInfo.Length ) && ( _selectedDateTimeInfo.Type != DateTimePart.Day ) )
+            {
+              _fireSelectionChangedEvent = false;
+              this.TextBox.SelectionStart = Math.Max( 0, this.TextBox.SelectionStart + ( dayLength - lastDayInfo.Length ) );
+              _fireSelectionChangedEvent = true;
+            }
+            // Day has been added, move TextBox.Selection to keep it on current DateTimeInfo
+            else if( !hasDay )
+            {
+              _fireSelectionChangedEvent = false;
+              this.TextBox.SelectionStart += ( dayLength + 1 );
+              _fireSelectionChangedEvent = true;
+            }
           }
         }
-      }
-      // Day has been removed, move TextBox.Selection to keep it on current DateTimeInfo
-      else if( hasDay )
-      {
-        _fireSelectionChangedEvent = false;
-        this.TextBox.SelectionStart = Math.Max( hasNegative ? 1 : 0, this.TextBox.SelectionStart - (lastDayInfo.Length + 1) );
-        _fireSelectionChangedEvent = true;
+        // Day has been removed, move TextBox.Selection to keep it on current DateTimeInfo
+        else if( hasDay )
+        {
+          _fireSelectionChangedEvent = false;
+          this.TextBox.SelectionStart = Math.Max( hasNegative ? 1 : 0, this.TextBox.SelectionStart - ( lastDayInfo.Length + 1 ) );
+          _fireSelectionChangedEvent = true;
+        }
       }
 
       _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Hour24, Length = 2, Format = "hh" } );
@@ -346,7 +393,7 @@ namespace Xceed.Wpf.Toolkit
 
       if( value.HasValue )
       {
-        this.ParseValueIntoTimeSpanInfo( value );
+        this.ParseValueIntoTimeSpanInfo( value, true );
       }
     }
 
@@ -371,7 +418,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region Methods
 
-    private string ParseValueIntoTimeSpanInfo( TimeSpan? value )
+    private string ParseValueIntoTimeSpanInfo( TimeSpan? value, bool modifyInfo )
     {
       string text = string.Empty;
 
@@ -379,50 +426,68 @@ namespace Xceed.Wpf.Toolkit
       {
         if( info.Format == null )
         {
-          info.StartPosition = text.Length;
-          info.Length = info.Content.Length;
+          if( modifyInfo )
+          {
+            info.StartPosition = text.Length;
+            info.Length = info.Content.Length;
+          }
           text += info.Content;
         }
         else
         {
           TimeSpan span = TimeSpan.Parse( value.ToString() );
-          info.StartPosition = text.Length;
+          if( modifyInfo )
+          {
+            info.StartPosition = text.Length;
+          }
+          var content = "";
 #if VS2008
           switch (info.Format)
           {
               case "hh":
-                  info.Content = span.Hours.ToString("00");
+                  // Display days and hours or totalHours
+                  content = ( !this.ShowDays && ( span.Days != 0 ) && ( info.Format == "hh" ) )
+                            ? Math.Truncate( Math.Abs( span.TotalHours ) ).ToString("00")
+                            : span.Hours.ToString("00");
                   break;
               case "mm":
-                  info.Content = span.Minutes.ToString("00");
+                  content = span.Minutes.ToString("00");
                   break;
               case "ss":
-                  info.Content = span.Seconds.ToString("00");
+                 content = span.Seconds.ToString("00");
                   break;
               case "dd":
-                  info.Content = span.Days.ToString();
+                  content = span.Days.ToString();
                   break;
               case "%f":
-                  info.Content = (span.Milliseconds / 100).ToString();
+                  content = (span.Milliseconds / 100).ToString();
                   break;
               case "ff":
-                  info.Content = (span.Milliseconds / 10).ToString();
+                 content = (span.Milliseconds / 10).ToString();
                   break;
               case "fff":
-                  info.Content = span.Milliseconds.ToString();
+                 content = span.Milliseconds.ToString();
                   break;
               default:
                   throw new InvalidOperationException("Wrong TimeSpan format");
           }
 #else
-          info.Content = span.ToString( info.Format, this.CultureInfo.DateTimeFormat );
+          // Display days and hours or totalHours
+          content = ( !this.ShowDays && ( span.Days != 0 ) && ( info.Format == "hh" ) )
+                    ? Math.Truncate( Math.Abs( span.TotalHours ) ).ToString()
+                    : span.ToString( info.Format, this.CultureInfo.DateTimeFormat );
 #endif
-          if( info.Format == "dd" )
+
+          if( modifyInfo )
           {
-            info.Content = Convert.ToInt32( info.Content ).ToString();
+            if( info.Format == "dd" )
+            {
+              content = Convert.ToInt32( content ).ToString();
+            }
+            info.Content = content;
+            info.Length = info.Content.Length;
           }
-          info.Length = info.Content.Length;
-          text += info.Content;
+          text += content;
         }
       } );
 
@@ -510,11 +575,8 @@ namespace Xceed.Wpf.Toolkit
           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.Text = this.ParseValueIntoTimeSpanInfo( newValue, false );
           this.TextBox.Select( selectionStart, selectionLength );
         }
       }
@@ -539,27 +601,6 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-#if !VS2008
-    private string GetTimeSpanFormat()
-    {
-      //use this format : "d.hh\:mm\:ss\.fff"
-      var formatParts = _dateTimeInfoList.Select( part =>
-      {
-        if( part.Format == null )
-          return '\\' + part.Content;
-
-        if( part.Format.Contains( 'd' ) )
-        {
-          var dayInfo = _dateTimeInfoList.FirstOrDefault( info => info.Type == DateTimePart.Day );
-          part.Format = string.Join( "", Enumerable.Repeat( "d", dayInfo.Length ) );
-        }
-        return part.Format;
-      } ).ToList();
-
-      return string.Join( "", formatParts );
-    }
-#endif
-
     private bool IsNumber( string str )
     {
       foreach( char c in str )
@@ -571,6 +612,15 @@ namespace Xceed.Wpf.Toolkit
       return true;
     }
 
+    private void UpdateValue()
+    {
+      var value = this.UpdateValueOnEnterKey
+                  ? ( this.TextBox != null ) ? this.ConvertTextToValue( this.TextBox.Text ) : null
+                  : this.Value;
+      this.InitializeDateTimeInfoList( value );
+      this.SyncTextAndValueProperties( false, this.Text );
+    }
+
     #endregion
 
     #region Event Handlers
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.i.lref
index b526a5b6..fd28d542 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.i.lref
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.i.lref
@@ -1,79 +1,79 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
 
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.5.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml;;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index c74b3029..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml
deleted file mode 100644
index d1d519d0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 41d8a27d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml
deleted file mode 100644
index 079ca992..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index ca90bb57..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml
deleted file mode 100644
index 78260e21..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 84dc6814..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml
deleted file mode 100644
index e4f0708e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 16567c75..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml
deleted file mode 100644
index c9ebe999..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 8ce47497..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml
deleted file mode 100644
index 54089b7f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 2ff3ab29..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml
deleted file mode 100644
index 8bae09c0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 4888f686..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml
deleted file mode 100644
index 54f18c78..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml
deleted file mode 100644
index 8455af23..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs
deleted file mode 100644
index a3efa890..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F317F2D7BDADD3B25B8299860CBC45BB00787CE2"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-
-
-namespace Xceed.Wpf.Toolkit {
-    
-    
-    /// <summary>
-    /// CollectionControlDialog
-    /// </summary>
-    public partial class CollectionControlDialog : Xceed.Wpf.Toolkit.CollectionControlDialogBase, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 32 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CollectionControl _collectionControl;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit;component/collectioncontrol/implementation/collectioncontroldi" +
-                    "alog.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._collectionControl = ((Xceed.Wpf.Toolkit.CollectionControl)(target));
-            return;
-            case 2:
-            
-            #line 45 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 49 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.i.cs
deleted file mode 100644
index a3efa890..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.i.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F317F2D7BDADD3B25B8299860CBC45BB00787CE2"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-
-
-namespace Xceed.Wpf.Toolkit {
-    
-    
-    /// <summary>
-    /// CollectionControlDialog
-    /// </summary>
-    public partial class CollectionControlDialog : Xceed.Wpf.Toolkit.CollectionControlDialogBase, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 32 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CollectionControl _collectionControl;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit;component/collectioncontrol/implementation/collectioncontroldi" +
-                    "alog.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._collectionControl = ((Xceed.Wpf.Toolkit.CollectionControl)(target));
-            return;
-            case 2:
-            
-            #line 45 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 49 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 27721fe4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml
deleted file mode 100644
index 23a35c1a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 6028cacb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml
deleted file mode 100644
index 2b63fc0c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index fcb35386..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml
deleted file mode 100644
index a96e03c2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index c26d4597..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml
deleted file mode 100644
index 8125912a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 030a322e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml
deleted file mode 100644
index ef8f1f2b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 7e9ba5b3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml
deleted file mode 100644
index a64deff7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.i.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.i.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 670c91da..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml
deleted file mode 100644
index 670c91da..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml
deleted file mode 100644
index f583b7bc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 5fc96cb0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml
deleted file mode 100644
index ed8407d9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 6eada85e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml
deleted file mode 100644
index e58637e1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 5dfa3d07..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml
deleted file mode 100644
index 22893caf..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index bc8e06ee..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml
deleted file mode 100644
index bc8e06ee..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml
deleted file mode 100644
index a3b3c3b8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml
deleted file mode 100644
index 127733aa..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml
deleted file mode 100644
index 4ff118e6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml
deleted file mode 100644
index e08faa4d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index d9951a95..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml
deleted file mode 100644
index c104c0ca..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 508a50b3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml
deleted file mode 100644
index fceecb14..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 1de6cd22..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml
deleted file mode 100644
index 9bb7e859..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 59886a96..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml
deleted file mode 100644
index 8c6d0464..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml
deleted file mode 100644
index a4c28f10..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml
deleted file mode 100644
index 73c94bd2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml
deleted file mode 100644
index 73fffc3f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 5b175593..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml
deleted file mode 100644
index 15b1701d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml
deleted file mode 100644
index a65ffaa6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml
deleted file mode 100644
index 15d61c8a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml
deleted file mode 100644
index 0e23d2b4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml
deleted file mode 100644
index 65aaa85f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml
deleted file mode 100644
index 6f9118cc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml
deleted file mode 100644
index fadb53e3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml
deleted file mode 100644
index a02da153..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml
deleted file mode 100644
index 0e23d2b4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml
deleted file mode 100644
index db10e78f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml
deleted file mode 100644
index db10e78f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml
deleted file mode 100644
index db10e78f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml
deleted file mode 100644
index db10e78f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml
deleted file mode 100644
index db10e78f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 52ac9d6c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml
deleted file mode 100644
index f5d89560..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 1dc72223..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml
deleted file mode 100644
index c2a7e0ec..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 4dec1182..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml
deleted file mode 100644
index 4dec1182..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index c6e05e70..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml
deleted file mode 100644
index 5b490c42..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index f9770a59..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml
deleted file mode 100644
index bea18331..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
deleted file mode 100644
index 4f949211..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
deleted file mode 100644
index ed605324..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\classic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.homestead.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.metallic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\SelectorItem.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\WindowControl.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\SelectorItem.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\WindowControl.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Magnifier\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Brushes.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Buttons.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Common.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Glyphs.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Brushes_NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Buttons_NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Brushes.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Buttons.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Common.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Glyphs.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources
deleted file mode 100644
index 341843ad..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.i.lref
deleted file mode 100644
index 87937ca3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.i.lref
+++ /dev/null
@@ -1,79 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.i.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref
deleted file mode 100644
index ea0b55cb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref
+++ /dev/null
@@ -1,79 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index a6537f49..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml
deleted file mode 100644
index a6537f49..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
index d36b925f..00e73cbd 100644
--- a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
+++ b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit.LiveExplo
 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}"
@@ -23,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		APD.Wpf.Xceed.AvalonDock.nuspec = APD.Wpf.Xceed.AvalonDock.nuspec
 		APD.Wpf.Xceed.DataGrid.nuspec = APD.Wpf.Xceed.DataGrid.nuspec
+		APD.Wpf.Xceed.ToolKit.Full.nuspec = APD.Wpf.Xceed.ToolKit.Full.nuspec
 		APD.Wpf.Xceed.Toolkit.nuspec = APD.Wpf.Xceed.Toolkit.nuspec
 	EndProjectSection
 EndProject
@@ -40,10 +39,6 @@ Global
 		{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
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
deleted file mode 100644
index c6ea985d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-#pragma warning disable 0436
-[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
-#pragma warning restore 0436
-
-internal static class _XceedVersionInfo
-{
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "3.4";
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string Version = BaseVersion + 
-  ".0.0";
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string PublicKeyToken = "ba83ff368b7563c6";
-
-
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
deleted file mode 100644
index 3316fb13..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-internal static class _XceedVersionInfoCommon
-{
-[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string Build = ".*";
-
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
deleted file mode 100644
index 0b2738c9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum AutoSelectBehavior
-  {
-    Never,
-    OnFocus
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
deleted file mode 100644
index cd17a9b2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class AutoSelectTextBox : TextBox
-  {
-    public AutoSelectTextBox()
-    {
-    }
-
-    #region AutoSelectBehavior PROPERTY
-
-    public AutoSelectBehavior AutoSelectBehavior
-    {
-      get
-      {
-        return ( AutoSelectBehavior )GetValue( AutoSelectBehaviorProperty );
-      }
-      set
-      {
-        SetValue( AutoSelectBehaviorProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty AutoSelectBehaviorProperty =
-        DependencyProperty.Register( "AutoSelectBehavior", typeof( AutoSelectBehavior ), typeof( AutoSelectTextBox ),
-      new UIPropertyMetadata( AutoSelectBehavior.Never ) );
-
-    #endregion AutoSelectBehavior PROPERTY
-
-    #region AutoMoveFocus PROPERTY
-
-    public bool AutoMoveFocus
-    {
-      get
-      {
-        return ( bool )GetValue( AutoMoveFocusProperty );
-      }
-      set
-      {
-        SetValue( AutoMoveFocusProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty AutoMoveFocusProperty =
-        DependencyProperty.Register( "AutoMoveFocus", typeof( bool ), typeof( AutoSelectTextBox ), new UIPropertyMetadata( false ) );
-
-    #endregion AutoMoveFocus PROPERTY
-
-    #region QueryMoveFocus EVENT
-
-    public static readonly RoutedEvent QueryMoveFocusEvent = EventManager.RegisterRoutedEvent( "QueryMoveFocus",
-                                                                                                RoutingStrategy.Bubble,
-                                                                                                typeof( QueryMoveFocusEventHandler ),
-                                                                                                typeof( AutoSelectTextBox ) );
-    #endregion QueryMoveFocus EVENT
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( !this.AutoMoveFocus )
-      {
-        base.OnPreviewKeyDown( e );
-        return;
-      }
-
-      if( ( e.Key == Key.Left )
-        && ( ( Keyboard.Modifiers == ModifierKeys.None )
-          || ( Keyboard.Modifiers == ModifierKeys.Control ) ) )
-      {
-        e.Handled = this.MoveFocusLeft();
-      }
-
-      if( ( e.Key == Key.Right )
-        && ( ( Keyboard.Modifiers == ModifierKeys.None )
-          || ( Keyboard.Modifiers == ModifierKeys.Control ) ) )
-      {
-        e.Handled = this.MoveFocusRight();
-      }
-
-      if( ( ( e.Key == Key.Up ) || ( e.Key == Key.PageUp ) )
-        && ( ( Keyboard.Modifiers == ModifierKeys.None )
-          || ( Keyboard.Modifiers == ModifierKeys.Control ) ) )
-      {
-        e.Handled = this.MoveFocusUp();
-      }
-
-      if( ( ( e.Key == Key.Down ) || ( e.Key == Key.PageDown ) )
-       && ( ( Keyboard.Modifiers == ModifierKeys.None )
-         || ( Keyboard.Modifiers == ModifierKeys.Control ) ) )
-      {
-        e.Handled = this.MoveFocusDown();
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      base.OnPreviewGotKeyboardFocus( e );
-
-      if( this.AutoSelectBehavior == AutoSelectBehavior.OnFocus )
-      {
-        // If the focus was not in one of our child ( or popup ), we select all the text.
-        if( !TreeHelper.IsDescendantOf( e.OldFocus as DependencyObject, this ) )
-        {
-          this.SelectAll();
-        }
-      }
-    }
-
-    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      base.OnPreviewMouseLeftButtonDown( e );
-
-      if( this.AutoSelectBehavior == AutoSelectBehavior.Never )
-        return;
-
-      if( this.IsKeyboardFocusWithin == false )
-      {
-        this.Focus();
-        e.Handled = true;  //prevent from removing the selection
-      }
-    }
-
-    protected override void OnTextChanged( TextChangedEventArgs e )
-    {
-      base.OnTextChanged( e );
-
-      if( !this.AutoMoveFocus )
-        return;
-
-      if( ( this.Text.Length != 0 )
-          && ( this.Text.Length == this.MaxLength )
-          && ( this.CaretIndex == this.MaxLength ) )
-      {
-        if( this.CanMoveFocus( FocusNavigationDirection.Right, true ) == true )
-        {
-          FocusNavigationDirection direction = ( this.FlowDirection == FlowDirection.LeftToRight )
-            ? FocusNavigationDirection.Right
-            : FocusNavigationDirection.Left;
-
-          this.MoveFocus( new TraversalRequest( direction ) );
-        }
-      }
-    }
-
-
-    private bool CanMoveFocus( FocusNavigationDirection direction, bool reachedMax )
-    {
-      QueryMoveFocusEventArgs e = new QueryMoveFocusEventArgs( direction, reachedMax );
-      this.RaiseEvent( e );
-      return e.CanMoveFocus;
-    }
-
-    private bool MoveFocusLeft()
-    {
-      if( this.FlowDirection == FlowDirection.LeftToRight )
-      {
-        //occurs only if the cursor is at the beginning of the text
-        if( ( this.CaretIndex == 0 ) && ( this.SelectionLength == 0 ) )
-        {
-          if( ComponentCommands.MoveFocusBack.CanExecute( null, this ) )
-          {
-            ComponentCommands.MoveFocusBack.Execute( null, this );
-            return true;
-          }
-          else if( this.CanMoveFocus( FocusNavigationDirection.Left, false ) )
-          {
-            this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Left ) );
-            return true;
-          }
-        }
-      }
-      else
-      {
-        //occurs only if the cursor is at the end of the text
-        if( ( this.CaretIndex == this.Text.Length ) && ( this.SelectionLength == 0 ) )
-        {
-          if( ComponentCommands.MoveFocusBack.CanExecute( null, this ) )
-          {
-            ComponentCommands.MoveFocusBack.Execute( null, this );
-            return true;
-          }
-          else if( this.CanMoveFocus( FocusNavigationDirection.Left, false ) )
-          {
-            this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Left ) );
-            return true;
-          }
-        }
-      }
-
-      return false;
-    }
-
-    private bool MoveFocusRight()
-    {
-      if( this.FlowDirection == FlowDirection.LeftToRight )
-      {
-        //occurs only if the cursor is at the beginning of the text
-        if( ( this.CaretIndex == this.Text.Length ) && ( this.SelectionLength == 0 ) )
-        {
-          if( ComponentCommands.MoveFocusForward.CanExecute( null, this ) )
-          {
-            ComponentCommands.MoveFocusForward.Execute( null, this );
-            return true;
-          }
-          else if( this.CanMoveFocus( FocusNavigationDirection.Right, false ) )
-          {
-            this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Right ) );
-            return true;
-          }
-        }
-      }
-      else
-      {
-        //occurs only if the cursor is at the end of the text
-        if( ( this.CaretIndex == 0 ) && ( this.SelectionLength == 0 ) )
-        {
-          if( ComponentCommands.MoveFocusForward.CanExecute( null, this ) )
-          {
-            ComponentCommands.MoveFocusForward.Execute( null, this );
-            return true;
-          }
-          else if( this.CanMoveFocus( FocusNavigationDirection.Right, false ) )
-          {
-            this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Right ) );
-            return true;
-          }
-        }
-      }
-
-      return false;
-    }
-
-    private bool MoveFocusUp()
-    {
-      int lineNumber = this.GetLineIndexFromCharacterIndex( this.SelectionStart );
-
-      //occurs only if the cursor is on the first line
-      if( lineNumber == 0 )
-      {
-        if( ComponentCommands.MoveFocusUp.CanExecute( null, this ) )
-        {
-          ComponentCommands.MoveFocusUp.Execute( null, this );
-          return true;
-        }
-        else if( this.CanMoveFocus( FocusNavigationDirection.Up, false ) )
-        {
-          this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Up ) );
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    private bool MoveFocusDown()
-    {
-      int lineNumber = this.GetLineIndexFromCharacterIndex( this.SelectionStart );
-
-      //occurs only if the cursor is on the first line
-      if( lineNumber == ( this.LineCount - 1 ) )
-      {
-        if( ComponentCommands.MoveFocusDown.CanExecute( null, this ) )
-        {
-          ComponentCommands.MoveFocusDown.Execute( null, this );
-          return true;
-        }
-        else if( this.CanMoveFocus( FocusNavigationDirection.Down, false ) )
-        {
-          this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Down ) );
-          return true;
-        }
-      }
-
-      return false;
-    }
-  }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
deleted file mode 100644
index 141fbab9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1003:UseGenericEventHandlerInstances" )]
-  public delegate void QueryMoveFocusEventHandler( object sender, QueryMoveFocusEventArgs e );
-
-  public class QueryMoveFocusEventArgs : RoutedEventArgs
-  {
-    //default CTOR private to prevent its usage.
-    private QueryMoveFocusEventArgs()
-    {
-    }
-
-    //internal to prevent anybody from building this type of event.
-    internal QueryMoveFocusEventArgs( FocusNavigationDirection direction, bool reachedMaxLength )
-      : base( AutoSelectTextBox.QueryMoveFocusEvent )
-    {
-      m_navigationDirection = direction;
-      m_reachedMaxLength = reachedMaxLength;
-    }
-
-    public FocusNavigationDirection FocusNavigationDirection
-    {
-      get
-      {
-        return m_navigationDirection;
-      }
-    }
-
-    public bool ReachedMaxLength
-    {
-      get
-      {
-        return m_reachedMaxLength;
-      }
-    }
-
-    public bool CanMoveFocus
-    {
-      get
-      {
-        return m_canMove;
-      }
-      set
-      {
-        m_canMove = value;
-      }
-    }
-
-    private FocusNavigationDirection m_navigationDirection;
-    private bool m_reachedMaxLength;
-    private bool m_canMove = true; //defaults to true... if nobody does nothing, then its capable of moving focus.
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
deleted file mode 100644
index a61532db..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
+++ /dev/null
@@ -1,360 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Shapes;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// A control to provide a visual indicator when an application is busy.
-  /// </summary>
-  [TemplateVisualState( Name = VisualStates.StateIdle, GroupName = VisualStates.GroupBusyStatus )]
-  [TemplateVisualState( Name = VisualStates.StateBusy, GroupName = VisualStates.GroupBusyStatus )]
-  [TemplateVisualState( Name = VisualStates.StateVisible, GroupName = VisualStates.GroupVisibility )]
-  [TemplateVisualState( Name = VisualStates.StateHidden, GroupName = VisualStates.GroupVisibility )]
-  [StyleTypedProperty( Property = "OverlayStyle", StyleTargetType = typeof( Rectangle ) )]
-  [StyleTypedProperty( Property = "ProgressBarStyle", StyleTargetType = typeof( ProgressBar ) )]
-  public class BusyIndicator : ContentControl
-  {
-    #region Private Members
-
-    /// <summary>
-    /// Timer used to delay the initial display and avoid flickering.
-    /// </summary>
-    private DispatcherTimer _displayAfterTimer = new DispatcherTimer();
-
-    #endregion //Private Members
-
-    #region Constructors
-
-    static BusyIndicator()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( BusyIndicator ), new FrameworkPropertyMetadata( typeof( BusyIndicator ) ) );
-    }
-
-    public BusyIndicator()
-    {
-      _displayAfterTimer.Tick += DisplayAfterTimerElapsed;
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    /// <summary>
-    /// Overrides the OnApplyTemplate method.
-    /// </summary>
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-      ChangeVisualState( false );
-    }
-
-
-    #endregion //Base Class Overrides
-
-    #region Properties
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the BusyContent is visible.
-    /// </summary>
-    protected bool IsContentVisible
-    {
-      get;
-      set;
-    }
-
-    #endregion //Properties
-
-    #region Dependency Properties
-
-    #region IsBusy
-
-    /// <summary>
-    /// Identifies the IsBusy dependency property.
-    /// </summary>
-    public static readonly DependencyProperty IsBusyProperty = DependencyProperty.Register(
-        "IsBusy",
-        typeof( bool ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( false, new PropertyChangedCallback( OnIsBusyChanged ) ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the busy indicator should show.
-    /// </summary>
-    public bool IsBusy
-    {
-      get
-      {
-        return ( bool )GetValue( IsBusyProperty );
-      }
-      set
-      {
-        SetValue( IsBusyProperty, value );
-      }
-    }
-
-    /// <summary>
-    /// IsBusyProperty property changed handler.
-    /// </summary>
-    /// <param name="d">BusyIndicator that changed its IsBusy.</param>
-    /// <param name="e">Event arguments.</param>
-    private static void OnIsBusyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( BusyIndicator )d ).OnIsBusyChanged( e );
-    }
-
-    /// <summary>
-    /// IsBusyProperty property changed handler.
-    /// </summary>
-    /// <param name="e">Event arguments.</param>
-    protected virtual void OnIsBusyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( IsBusy )
-      {
-        if( DisplayAfter.Equals( TimeSpan.Zero ) )
-        {
-          // Go visible now
-          IsContentVisible = true;
-        }
-        else
-        {
-          // Set a timer to go visible
-          _displayAfterTimer.Interval = DisplayAfter;
-          _displayAfterTimer.Start();
-        }
-      }
-      else
-      {
-        // No longer visible
-        _displayAfterTimer.Stop();
-        IsContentVisible = false;
-
-        if( this.FocusAfterBusy != null )
-        {
-          this.FocusAfterBusy.Dispatcher.BeginInvoke( DispatcherPriority.Input, new Action( () =>
-          {
-            this.FocusAfterBusy.Focus();
-          }
-          ) );
-        }
-      }
-
-      ChangeVisualState( true );
-    }
-
-    #endregion //IsBusy
-
-    #region Busy Content
-
-    /// <summary>
-    /// Identifies the BusyContent dependency property.
-    /// </summary>
-    public static readonly DependencyProperty BusyContentProperty = DependencyProperty.Register(
-        "BusyContent",
-        typeof( object ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( null ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating the busy content to display to the user.
-    /// </summary>
-    public object BusyContent
-    {
-      get
-      {
-        return ( object )GetValue( BusyContentProperty );
-      }
-      set
-      {
-        SetValue( BusyContentProperty, value );
-      }
-    }
-
-    #endregion //Busy Content
-
-    #region Busy Content Template
-
-    /// <summary>
-    /// Identifies the BusyTemplate dependency property.
-    /// </summary>
-    public static readonly DependencyProperty BusyContentTemplateProperty = DependencyProperty.Register(
-        "BusyContentTemplate",
-        typeof( DataTemplate ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( null ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating the template to use for displaying the busy content to the user.
-    /// </summary>
-    public DataTemplate BusyContentTemplate
-    {
-      get
-      {
-        return ( DataTemplate )GetValue( BusyContentTemplateProperty );
-      }
-      set
-      {
-        SetValue( BusyContentTemplateProperty, value );
-      }
-    }
-
-    #endregion //Busy Content Template
-
-    #region Display After
-
-    /// <summary>
-    /// Identifies the DisplayAfter dependency property.
-    /// </summary>
-    public static readonly DependencyProperty DisplayAfterProperty = DependencyProperty.Register(
-        "DisplayAfter",
-        typeof( TimeSpan ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( TimeSpan.FromSeconds( 0.1 ) ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating how long to delay before displaying the busy content.
-    /// </summary>
-    public TimeSpan DisplayAfter
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( DisplayAfterProperty );
-      }
-      set
-      {
-        SetValue( DisplayAfterProperty, value );
-      }
-    }
-
-    #endregion //Display After
-
-    #region FocusAfterBusy
-
-    /// <summary>
-    /// Identifies the FocusAfterBusy dependency property.
-    /// </summary>
-    public static readonly DependencyProperty FocusAfterBusyProperty = DependencyProperty.Register(
-        "FocusAfterBusy",
-        typeof( Control ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( null ) );
-
-    /// <summary>
-    /// Gets or sets a Control that should get the focus when the busy indicator disapears.
-    /// </summary>
-    public Control FocusAfterBusy
-    {
-      get
-      {
-        return ( Control )GetValue( FocusAfterBusyProperty );
-      }
-      set
-      {
-        SetValue( FocusAfterBusyProperty, value );
-      }
-    }
-
-    #endregion //FocusAfterBusy
-
-    #region Overlay Style
-
-    /// <summary>
-    /// Identifies the OverlayStyle dependency property.
-    /// </summary>
-    public static readonly DependencyProperty OverlayStyleProperty = DependencyProperty.Register(
-        "OverlayStyle",
-        typeof( Style ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( null ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating the style to use for the overlay.
-    /// </summary>
-    public Style OverlayStyle
-    {
-      get
-      {
-        return ( Style )GetValue( OverlayStyleProperty );
-      }
-      set
-      {
-        SetValue( OverlayStyleProperty, value );
-      }
-    }
-    #endregion //Overlay Style
-
-    #region ProgressBar Style
-
-    /// <summary>
-    /// Identifies the ProgressBarStyle dependency property.
-    /// </summary>
-    public static readonly DependencyProperty ProgressBarStyleProperty = DependencyProperty.Register(
-        "ProgressBarStyle",
-        typeof( Style ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( null ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating the style to use for the progress bar.
-    /// </summary>
-    public Style ProgressBarStyle
-    {
-      get
-      {
-        return ( Style )GetValue( ProgressBarStyleProperty );
-      }
-      set
-      {
-        SetValue( ProgressBarStyleProperty, value );
-      }
-    }
-
-    #endregion //ProgressBar Style
-
-    #endregion //Dependency Properties
-
-    #region Methods
-
-    /// <summary>
-    /// Handler for the DisplayAfterTimer.
-    /// </summary>
-    /// <param name="sender">Event sender.</param>
-    /// <param name="e">Event arguments.</param>
-    private void DisplayAfterTimerElapsed( object sender, EventArgs e )
-    {
-      _displayAfterTimer.Stop();
-      IsContentVisible = true;
-      ChangeVisualState( true );
-    }
-
-    /// <summary>
-    /// Changes the control's visual state(s).
-    /// </summary>
-    /// <param name="useTransitions">True if state transitions should be used.</param>
-    protected virtual void ChangeVisualState( bool useTransitions )
-    {
-      VisualStateManager.GoToState( this, IsBusy ? VisualStates.StateBusy : VisualStates.StateIdle, useTransitions );
-      VisualStateManager.GoToState( this, IsContentVisible ? VisualStates.StateVisible : VisualStates.StateHidden, useTransitions );
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
deleted file mode 100644
index de6b0120..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Converters
-{
-  public class ProgressBarWidthConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    { 
-      var contentWidth = ( double )values[ 0 ];
-      var parentMinWidth = ( double )values[ 1 ];
-
-      return Math.Max( contentWidth, parentMinWidth );
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
deleted file mode 100644
index b218170f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal static partial class VisualStates
-  {
-    /// <summary>
-    /// Busyness group name.
-    /// </summary>
-    public const string GroupBusyStatus = "BusyStatusStates";
-
-    /// <summary>
-    /// Busy state for BusyIndicator.
-    /// </summary>
-    public const string StateBusy = "Busy";
-
-    /// <summary>
-    /// Idle state for BusyIndicator.
-    /// </summary>
-    public const string StateIdle = "Idle";
-
-    /// <summary>
-    /// BusyDisplay group.
-    /// </summary>
-    public const string GroupVisibility = "VisibilityStates";
-
-    /// <summary>
-    /// Visible state name for BusyIndicator.
-    /// </summary>
-    public const string StateVisible = "Visible";
-
-    /// <summary>
-    /// Hidden state name for BusyIndicator.
-    /// </summary>
-    public const string StateHidden = "Hidden";
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 3515614b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,215 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
-
-  <!-- =============================================================================== -->
-  <!-- BusyIndicator                                                                   -->
-  <!-- =============================================================================== -->
-
-  <ControlTemplate x:Key="BusyIndicatorTemplate"
-                   TargetType="{x:Type local:BusyIndicator}">
-    <Grid>
-      <VisualStateManager.VisualStateGroups>
-        <VisualStateGroup x:Name="VisibilityStates">
-          <VisualState x:Name="Hidden">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                             Duration="00:00:00.001"
-                                             Storyboard.TargetName="busycontent"
-                                             Storyboard.TargetProperty="(UIElement.Visibility)">
-                <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Collapsed</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                             Duration="00:00:00.001"
-                                             Storyboard.TargetName="overlay"
-                                             Storyboard.TargetProperty="(UIElement.Visibility)">
-                <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Collapsed</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-          <VisualState x:Name="Visible">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                             Duration="00:00:00.001"
-                                             Storyboard.TargetName="busycontent"
-                                             Storyboard.TargetProperty="(UIElement.Visibility)">
-                <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                             Duration="00:00:00.001"
-                                             Storyboard.TargetName="overlay"
-                                             Storyboard.TargetProperty="(UIElement.Visibility)">
-                <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-        </VisualStateGroup>
-        <VisualStateGroup x:Name="BusyStatusStates">
-          <VisualState x:Name="Idle">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                             Duration="00:00:00.001"
-                                             Storyboard.TargetName="content"
-                                             Storyboard.TargetProperty="(Control.IsEnabled)">
-                <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                  <DiscreteObjectKeyFrame.Value>
-                    <sys:Boolean>True</sys:Boolean>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-          <VisualState x:Name="Busy">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                             Duration="00:00:00.001"
-                                             Storyboard.TargetName="content"
-                                             Storyboard.TargetProperty="(Control.IsEnabled)">
-                <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                  <DiscreteObjectKeyFrame.Value>
-                    <sys:Boolean>False</sys:Boolean>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-        </VisualStateGroup>
-      </VisualStateManager.VisualStateGroups>
-      <ContentControl x:Name="content"
-                      Content="{TemplateBinding Content}"
-                      ContentTemplate="{TemplateBinding ContentTemplate}"
-                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                      IsTabStop="False"
-                      Focusable="False" />
-      <Rectangle x:Name="overlay"
-                 Style="{TemplateBinding OverlayStyle}" />
-      <ContentPresenter x:Name="busycontent">
-        <ContentPresenter.Content>
-          <Grid HorizontalAlignment="Center"
-                VerticalAlignment="Center">
-            <Border Background="White"
-                    BorderThickness="1"
-                    BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}"
-                    CornerRadius="0">
-              <Border Margin="1"
-                      Background="{TemplateBinding Background}"
-                      CornerRadius="0">
-                <Grid x:Name="_grid"
-                      MinWidth="150">
-                  <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-                  <ContentPresenter x:Name="busyContent"
-                                    Content="{TemplateBinding BusyContent}"
-                                    ContentTemplate="{TemplateBinding BusyContentTemplate}"
-                                    HorizontalAlignment="Center"
-                                    Margin="8" />
-                  <ProgressBar Grid.Row="1"
-                               Style="{TemplateBinding ProgressBarStyle}">
-                    <ProgressBar.Width>
-                      <MultiBinding Converter="{StaticResource ProgressBarWidthConverter}">
-                        <Binding Path="ActualWidth"
-                                 ElementName="busyContent" />
-                        <Binding Path="MinWidth"
-                                 ElementName="_grid" />
-                      </MultiBinding>
-                    </ProgressBar.Width>
-                  </ProgressBar>
-                </Grid>
-              </Border>
-            </Border>
-          </Grid>
-        </ContentPresenter.Content>
-      </ContentPresenter>
-    </Grid>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:BusyIndicator}">
-    <Setter Property="Background"
-            Value="{StaticResource PanelBackgroundBrush}" />
-    <Setter Property="BusyContent"
-            Value="Please wait..." />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="OverlayStyle">
-      <Setter.Value>
-        <Style TargetType="Rectangle">
-          <Setter Property="Fill"
-                  Value="White" />
-          <Setter Property="Opacity"
-                  Value="0.5" />
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="ProgressBarStyle">
-      <Setter.Value>
-        <Style TargetType="ProgressBar">
-          <Setter Property="IsIndeterminate"
-                  Value="True" />
-          <Setter Property="Height"
-                  Value="15" />
-          <Setter Property="Margin"
-                  Value="8,0,8,8" />
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="DisplayAfter"
-            Value="00:00:00.1" />
-    <Setter Property="HorizontalAlignment"
-            Value="Stretch" />
-    <Setter Property="VerticalAlignment"
-            Value="Stretch" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="Template"
-            Value="{StaticResource BusyIndicatorTemplate}" />
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
deleted file mode 100644
index 56e2a734..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
+++ /dev/null
@@ -1,226 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-  <!-- =============================================================================== -->
-  <!-- BusyIndicator                                                                   -->
-  <!-- =============================================================================== -->
-  <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
-
-  <Style TargetType="{x:Type local:BusyIndicator}">
-    <Setter Property="BusyContent"
-            Value="Please wait..." />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="OverlayStyle">
-      <Setter.Value>
-        <Style TargetType="Rectangle">
-          <Setter Property="Fill"
-                  Value="White" />
-          <Setter Property="Opacity"
-                  Value="0.5" />
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="ProgressBarStyle">
-      <Setter.Value>
-        <Style TargetType="ProgressBar">
-          <Setter Property="IsIndeterminate"
-                  Value="True" />
-          <Setter Property="Height"
-                  Value="15" />
-          <Setter Property="Margin"
-                  Value="8,0,8,8" />
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="DisplayAfter"
-            Value="00:00:00.1" />
-    <Setter Property="HorizontalAlignment"
-            Value="Stretch" />
-    <Setter Property="VerticalAlignment"
-            Value="Stretch" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:BusyIndicator}">
-          <Grid>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="VisibilityStates">
-                <VisualState x:Name="Hidden">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                   Duration="00:00:00.001"
-                                                   Storyboard.TargetName="busycontent"
-                                                   Storyboard.TargetProperty="(UIElement.Visibility)">
-                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Collapsed</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                   Duration="00:00:00.001"
-                                                   Storyboard.TargetName="overlay"
-                                                   Storyboard.TargetProperty="(UIElement.Visibility)">
-                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Collapsed</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Visible">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                   Duration="00:00:00.001"
-                                                   Storyboard.TargetName="busycontent"
-                                                   Storyboard.TargetProperty="(UIElement.Visibility)">
-                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                   Duration="00:00:00.001"
-                                                   Storyboard.TargetName="overlay"
-                                                   Storyboard.TargetProperty="(UIElement.Visibility)">
-                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="BusyStatusStates">
-                <VisualState x:Name="Idle">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                   Duration="00:00:00.001"
-                                                   Storyboard.TargetName="content"
-                                                   Storyboard.TargetProperty="(Control.IsEnabled)">
-                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                        <DiscreteObjectKeyFrame.Value>
-                          <sys:Boolean>True</sys:Boolean>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Busy">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                   Duration="00:00:00.001"
-                                                   Storyboard.TargetName="content"
-                                                   Storyboard.TargetProperty="(Control.IsEnabled)">
-                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                        <DiscreteObjectKeyFrame.Value>
-                          <sys:Boolean>False</sys:Boolean>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <ContentControl x:Name="content"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            IsTabStop="False"
-                            Focusable="False" />
-            <Rectangle x:Name="overlay"
-                       Style="{TemplateBinding OverlayStyle}" />
-            <ContentPresenter x:Name="busycontent">
-              <ContentPresenter.Content>
-                <Grid HorizontalAlignment="Center"
-                      VerticalAlignment="Center">
-                  <Border Background="White"
-                          BorderThickness="1"
-                          CornerRadius="2">
-                    <Border.BorderBrush>
-                      <LinearGradientBrush StartPoint="0.5,0"
-                                           EndPoint="0.5,1">
-                        <GradientStop Color="#FFA3AEB9"
-                                      Offset="0" />
-                        <GradientStop Color="#FF8399A9"
-                                      Offset="0.375" />
-                        <GradientStop Color="#FF718597"
-                                      Offset="0.375" />
-                        <GradientStop Color="#FF617584"
-                                      Offset="1" />
-                      </LinearGradientBrush>
-                    </Border.BorderBrush>
-                    <Border CornerRadius="1.5"
-                            Margin="1">
-                      <Border.Background>
-                        <LinearGradientBrush StartPoint="0.5,0"
-                                             EndPoint="0.5,1">
-                          <GradientStop Color="#FFF6F8F9"
-                                        Offset="0.02" />
-                          <GradientStop Color="#FFB8B8B8"
-                                        Offset="0.996" />
-                        </LinearGradientBrush>
-                      </Border.Background>
-                      <Grid x:Name="_grid"
-                            MinWidth="150">
-                        <Grid.RowDefinitions>
-                          <RowDefinition />
-                          <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <ContentControl Content="{TemplateBinding BusyContent}"
-                                        ContentTemplate="{TemplateBinding BusyContentTemplate}"
-                                        Margin="8"
-                                        HorizontalAlignment="Center" />
-                        <ProgressBar Grid.Row="1"
-                                     Style="{TemplateBinding ProgressBarStyle}">
-                          <ProgressBar.Width>
-                            <MultiBinding Converter="{StaticResource ProgressBarWidthConverter}">
-                              <Binding Path="ActualWidth"
-                                       ElementName="busyContent" />
-                              <Binding Path="MinWidth"
-                                       ElementName="_grid" />
-                            </MultiBinding>
-                          </ProgressBar.Width>
-                        </ProgressBar>
-                      </Grid>
-                    </Border>
-                  </Border>
-                </Grid>
-              </ContentPresenter.Content>
-            </ContentPresenter>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
deleted file mode 100644
index 135a6e80..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Markup;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum Location
-  {
-    Left,
-    Right
-  }
-
-  /// <summary>
-  /// Represents a spinner control that includes two Buttons.
-  /// </summary>
-  [TemplatePart( Name = PART_IncreaseButton, Type = typeof( ButtonBase ) )]
-  [TemplatePart( Name = PART_DecreaseButton, Type = typeof( ButtonBase ) )]
-  [ContentProperty( "Content" )]
-  public class ButtonSpinner : Spinner
-  {
-    private const string PART_IncreaseButton = "PART_IncreaseButton";
-    private const string PART_DecreaseButton = "PART_DecreaseButton";
-
-    #region Properties
-
-    #region AllowSpin
-
-    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( ButtonSpinner ), new UIPropertyMetadata( true, AllowSpinPropertyChanged ) );
-    public bool AllowSpin
-    {
-      get
-      {
-        return ( bool )GetValue( AllowSpinProperty );
-      }
-      set
-      {
-        SetValue( AllowSpinProperty, value );
-      }
-    }
-
-    private static void AllowSpinPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonSpinner source = d as ButtonSpinner;
-      source.OnAllowSpinChanged( (bool)e.OldValue, (bool)e.NewValue );
-    }
-
-    #endregion //AllowSpin
-
-    #region ButtonSpinnerLocation
-
-    public static readonly DependencyProperty ButtonSpinnerLocationProperty = DependencyProperty.Register( "ButtonSpinnerLocation", typeof( Location ), typeof( ButtonSpinner ), new UIPropertyMetadata( Location.Right ) );
-    public Location ButtonSpinnerLocation
-    {
-      get
-      {
-        return ( Location )GetValue( ButtonSpinnerLocationProperty );
-      }
-      set
-      {
-        SetValue( ButtonSpinnerLocationProperty, value );
-      }
-    }
-
-    #endregion //ButtonSpinnerLocation
-
-    #region Content
-
-    /// <summary>
-    /// Identifies the Content dependency property.
-    /// </summary>
-    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register( "Content", typeof( object ), typeof( ButtonSpinner ), new PropertyMetadata( null, OnContentPropertyChanged ) );
-    public object Content
-    {
-      get
-      {
-        return GetValue( ContentProperty ) as object;
-      }
-      set
-      {
-        SetValue( ContentProperty, value );
-      }
-    }
-
-    /// <summary>
-    /// ContentProperty property changed handler.
-    /// </summary>
-    /// <param name="d">ButtonSpinner that changed its Content.</param>
-    /// <param name="e">Event arguments.</param>
-    private static void OnContentPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonSpinner source = d as ButtonSpinner;
-      source.OnContentChanged( e.OldValue, e.NewValue );
-    }
-
-    #endregion //Content
-
-    #region DecreaseButton
-
-    private ButtonBase _decreaseButton;
-    /// <summary>
-    /// Gets or sets the DecreaseButton template part.
-    /// </summary>
-    private ButtonBase DecreaseButton
-    {
-      get
-      {
-        return _decreaseButton;
-      }
-      set
-      {
-        if( _decreaseButton != null )
-        {
-          _decreaseButton.Click -= OnButtonClick;
-        }
-
-        _decreaseButton = value;
-
-        if( _decreaseButton != null )
-        {
-          _decreaseButton.Click += OnButtonClick;
-        }
-      }
-    }
-
-    #endregion //DecreaseButton
-
-    #region IncreaseButton
-
-    private ButtonBase _increaseButton;
-    /// <summary>
-    /// Gets or sets the IncreaseButton template part.
-    /// </summary>
-    private ButtonBase IncreaseButton
-    {
-      get
-      {
-        return _increaseButton;
-      }
-      set
-      {
-        if( _increaseButton != null )
-        {
-          _increaseButton.Click -= OnButtonClick;
-        }
-
-        _increaseButton = value;
-
-        if( _increaseButton != null )
-        {
-          _increaseButton.Click += OnButtonClick;
-        }
-      }
-    }
-
-    #endregion //IncreaseButton
-
-    #region ShowButtonSpinner
-
-    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( ButtonSpinner ), new UIPropertyMetadata( true ) );
-    public bool ShowButtonSpinner
-    {
-      get
-      {
-        return ( bool )GetValue( ShowButtonSpinnerProperty );
-      }
-      set
-      {
-        SetValue( ShowButtonSpinnerProperty, value );
-      }
-    }
-
-    #endregion //ShowButtonSpinner
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static ButtonSpinner()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ButtonSpinner ), new FrameworkPropertyMetadata( typeof( ButtonSpinner ) ) );
-    }
-
-    public ButtonSpinner()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      IncreaseButton = GetTemplateChild( PART_IncreaseButton ) as ButtonBase;
-      DecreaseButton = GetTemplateChild( PART_DecreaseButton ) as ButtonBase;
-
-      SetButtonUsage();
-    }
-
-    /// <summary>
-    /// Cancel LeftMouseButtonUp events originating from a button that has
-    /// been changed to disabled.
-    /// </summary>
-    /// <param name="e">The data for the event.</param>
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      base.OnMouseLeftButtonUp( e );
-
-      Point mousePosition;
-      if( IncreaseButton != null && IncreaseButton.IsEnabled == false )
-      {
-        mousePosition = e.GetPosition( IncreaseButton );
-        if( mousePosition.X > 0 && mousePosition.X < IncreaseButton.ActualWidth &&
-            mousePosition.Y > 0 && mousePosition.Y < IncreaseButton.ActualHeight )
-        {
-          e.Handled = true;
-        }
-      }
-
-      if( DecreaseButton != null && DecreaseButton.IsEnabled == false )
-      {
-        mousePosition = e.GetPosition( DecreaseButton );
-        if( mousePosition.X > 0 && mousePosition.X < DecreaseButton.ActualWidth &&
-            mousePosition.Y > 0 && mousePosition.Y < DecreaseButton.ActualHeight )
-        {
-          e.Handled = true;
-        }
-      }
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      switch( e.Key )
-      {
-        case Key.Up:
-          {
-            if( this.AllowSpin )
-            {
-              this.OnSpin( new SpinEventArgs( Spinner.SpinnerSpinEvent, SpinDirection.Increase ) );
-              e.Handled = true;
-            }
-
-            break;
-          }
-        case Key.Down:
-          {
-            if( this.AllowSpin )
-            {
-              this.OnSpin( new SpinEventArgs( Spinner.SpinnerSpinEvent, SpinDirection.Decrease ) );
-              e.Handled = true;
-            }
-
-            break;
-          }
-          case Key.Enter:
-          {
-            //Do not Spin on enter Key when spinners have focus
-            if( ((this.IncreaseButton != null) && (this.IncreaseButton.IsFocused)) 
-              || (( this.DecreaseButton != null ) && this.DecreaseButton.IsFocused ))
-            {
-              e.Handled = true;
-            }
-            break;
-          }
-      }
-    }
-
-    protected override void OnMouseWheel( MouseWheelEventArgs e )
-    {
-      base.OnMouseWheel( e );
-
-      if( !e.Handled && this.AllowSpin )
-      {
-        if( e.Delta != 0 )
-        {
-          var spinnerEventArgs = new SpinEventArgs( Spinner.SpinnerSpinEvent, ( e.Delta < 0 ) ? SpinDirection.Decrease : SpinDirection.Increase, true );
-          this.OnSpin( spinnerEventArgs );
-          e.Handled = spinnerEventArgs.Handled;
-        }
-      }
-    }
-
-    /// <summary>
-    /// Called when valid spin direction changed.
-    /// </summary>
-    /// <param name="oldValue">The old value.</param>
-    /// <param name="newValue">The new value.</param>
-    protected override void OnValidSpinDirectionChanged( ValidSpinDirections oldValue, ValidSpinDirections newValue )
-    {
-      SetButtonUsage();
-    }
-
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    /// <summary>
-    /// Handle click event of IncreaseButton and DecreaseButton template parts,
-    /// translating Click to appropriate Spin event.
-    /// </summary>
-    /// <param name="sender">Event sender, should be either IncreaseButton or DecreaseButton template part.</param>
-    /// <param name="e">Event args.</param>
-    private void OnButtonClick( object sender, RoutedEventArgs e )
-    {
-      if( AllowSpin )
-      {
-        SpinDirection direction = sender == IncreaseButton ? SpinDirection.Increase : SpinDirection.Decrease;
-        OnSpin( new SpinEventArgs( Spinner.SpinnerSpinEvent, direction ) );
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    /// <summary>
-    /// Occurs when the Content property value changed.
-    /// </summary>
-    /// <param name="oldValue">The old value of the Content property.</param>
-    /// <param name="newValue">The new value of the Content property.</param>
-    protected virtual void OnContentChanged( object oldValue, object newValue )
-    {
-    }
-
-    protected virtual void OnAllowSpinChanged( bool oldValue, bool newValue )
-    {
-      SetButtonUsage();
-    }
-
-    /// <summary>
-    /// Disables or enables the buttons based on the valid spin direction.
-    /// </summary>
-    private void SetButtonUsage()
-    {
-      // buttonspinner adds buttons that spin, so disable accordingly.
-      if( IncreaseButton != null )
-      {
-        IncreaseButton.IsEnabled = AllowSpin && ( ( ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase );
-      }
-
-      if( DecreaseButton != null )
-      {
-        DecreaseButton.IsEnabled = AllowSpin && ( ( ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease );
-      }
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
deleted file mode 100644
index b9d00996..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Represents spin directions that could be initiated by the end-user.
-  /// </summary>
-  /// <QualityBand>Preview</QualityBand>
-  public enum SpinDirection
-  {
-    /// <summary>
-    /// Represents a spin initiated by the end-user in order to Increase a value.
-    /// </summary>
-    Increase = 0,
-
-    /// <summary>
-    /// Represents a spin initiated by the end-user in order to Decrease a value.
-    /// </summary>
-    Decrease = 1
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
deleted file mode 100644
index a9b30b08..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Provides data for the Spinner.Spin event.
-  /// </summary>
-  /// <QualityBand>Preview</QualityBand>
-  public class SpinEventArgs : RoutedEventArgs
-  {
-    /// <summary>
-    /// Gets the SpinDirection for the spin that has been initiated by the 
-    /// end-user.
-    /// </summary>
-    public SpinDirection Direction
-    {
-      get;
-      private set;
-    }
-
-    /// <summary>
-    /// Get or set whheter the spin event originated from a mouse wheel event.
-    /// </summary>
-    public bool UsingMouseWheel
-    {
-      get;
-      private set;
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the SpinEventArgs class.
-    /// </summary>
-    /// <param name="direction">Spin direction.</param>
-    public SpinEventArgs( SpinDirection direction )
-      : base()
-    {
-      Direction = direction;
-    }
-
-    public SpinEventArgs( RoutedEvent routedEvent, SpinDirection direction )
-      : base( routedEvent )
-    {
-      Direction = direction;
-    }
-
-    public SpinEventArgs( SpinDirection direction, bool usingMouseWheel )
-      : base()
-    {
-      Direction = direction;
-      UsingMouseWheel = usingMouseWheel;
-    }
-
-    public SpinEventArgs( RoutedEvent routedEvent, SpinDirection direction, bool usingMouseWheel )
-      : base( routedEvent )
-    {
-      Direction = direction;
-      UsingMouseWheel = usingMouseWheel;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
deleted file mode 100644
index b71397d0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Base class for controls that represents controls that can spin.
-  /// </summary>
-  public abstract class Spinner : Control
-  {
-    #region Properties
-
-    /// <summary>
-    /// Identifies the ValidSpinDirection dependency property.
-    /// </summary>
-    public static readonly DependencyProperty ValidSpinDirectionProperty = DependencyProperty.Register( "ValidSpinDirection", typeof( ValidSpinDirections ), typeof( Spinner ), new PropertyMetadata( ValidSpinDirections.Increase | ValidSpinDirections.Decrease, OnValidSpinDirectionPropertyChanged ) );
-    public ValidSpinDirections ValidSpinDirection
-    {
-      get
-      {
-        return ( ValidSpinDirections )GetValue( ValidSpinDirectionProperty );
-      }
-      set
-      {
-        SetValue( ValidSpinDirectionProperty, value );
-      }
-    }
-
-    /// <summary>
-    /// ValidSpinDirectionProperty property changed handler.
-    /// </summary>
-    /// <param name="d">ButtonSpinner that changed its ValidSpinDirection.</param>
-    /// <param name="e">Event arguments.</param>
-    private static void OnValidSpinDirectionPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Spinner source = ( Spinner )d;
-      ValidSpinDirections oldvalue = ( ValidSpinDirections )e.OldValue;
-      ValidSpinDirections newvalue = ( ValidSpinDirections )e.NewValue;
-      source.OnValidSpinDirectionChanged( oldvalue, newvalue );
-    }
-
-    #endregion //Properties
-
-    /// <summary>
-    /// Occurs when spinning is initiated by the end-user.
-    /// </summary>
-    public event EventHandler<SpinEventArgs> Spin;
-
-    #region Events
-
-    public static readonly RoutedEvent SpinnerSpinEvent = EventManager.RegisterRoutedEvent( "SpinnerSpin", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Spinner ) );
-
-    public event RoutedEventHandler SpinnerSpin
-    {
-      add
-      {
-        AddHandler( SpinnerSpinEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( SpinnerSpinEvent, value );
-      }
-    }
-
-    #endregion
-
-    /// <summary>
-    /// Initializes a new instance of the Spinner class.
-    /// </summary>
-    protected Spinner()
-    {
-    }
-
-    /// <summary>
-    /// Raises the OnSpin event when spinning is initiated by the end-user.
-    /// </summary>
-    /// <param name="e">Spin event args.</param>
-    protected virtual void OnSpin( SpinEventArgs e )
-    {
-      ValidSpinDirections valid = e.Direction == SpinDirection.Increase ? ValidSpinDirections.Increase : ValidSpinDirections.Decrease;
-
-      //Only raise the event if spin is allowed.
-      if( ( ValidSpinDirection & valid ) == valid )
-      {
-        EventHandler<SpinEventArgs> handler = Spin;
-        if( handler != null )
-        {
-          handler( this, e );
-        }
-      }
-    }
-
-    /// <summary>
-    /// Called when valid spin direction changed.
-    /// </summary>
-    /// <param name="oldValue">The old value.</param>
-    /// <param name="newValue">The new value.</param>
-    protected virtual void OnValidSpinDirectionChanged( ValidSpinDirections oldValue, ValidSpinDirections newValue )
-    {
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
deleted file mode 100644
index 0a7aba23..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Represents spin directions that are valid.
-  /// </summary>
-  [Flags]
-  public enum ValidSpinDirections
-  {
-    /// <summary>
-    /// Can not increase nor decrease.
-    /// </summary>
-    None = 0,
-
-    /// <summary>
-    /// Can increase.
-    /// </summary>
-    Increase = 1,
-
-    /// <summary>
-    /// Can decrease.
-    /// </summary>
-    Decrease = 2
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index ed8ad412..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-
-  <!-- =============================================================================== -->
-  <!-- ButtonSpinner                                                                   -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <Style TargetType="{x:Type local:ButtonSpinner}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="IsTabStop"
-            Value="True" />
-    <Setter Property="Padding"
-            Value="1" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
-          <Border x:Name="Border"
-                  SnapsToDevicePixels="True"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition x:Name="firstContentColumn"
-                                  Width="*" />
-                <ColumnDefinition x:Name="secondContentColumn"
-                                  Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <ContentPresenter x:Name="contentPresenter"
-                                Focusable="False"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-              <Grid x:Name="gridContent"
-                    Grid.Column="1"
-                    Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}"
-                    Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-
-                <RepeatButton x:Name="PART_IncreaseButton"
-                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                              IsTabStop="{TemplateBinding IsTabStop}"
-                              ContentTemplate="{StaticResource IncreaseGlyphNormalKey}">
-                </RepeatButton>
-
-                <RepeatButton x:Name="PART_DecreaseButton"
-                              Grid.Row="1"
-                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                              IsTabStop="{TemplateBinding IsTabStop}"
-                              ContentTemplate="{StaticResource DecreaseGlyphNormalKey}">
-                </RepeatButton>
-
-              </Grid>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocusWithin"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-            </Trigger>
-            <Trigger SourceName="PART_IncreaseButton"
-                     Property="IsEnabled"
-                     Value="False">
-              <Setter TargetName="PART_IncreaseButton"
-                      Property="ContentTemplate"
-                      Value="{StaticResource IncreaseGlyphDisabledKey}" />
-            </Trigger>
-            <Trigger SourceName="PART_DecreaseButton"
-                     Property="IsEnabled"
-                     Value="False">
-              <Setter TargetName="PART_DecreaseButton"
-                      Property="ContentTemplate"
-                      Value="{StaticResource DecreaseGlyphDisabledKey}" />
-            </Trigger>
-            <Trigger Property="ButtonSpinnerLocation"
-                     Value="Left">
-              <Setter TargetName="firstContentColumn"
-                      Property="Width"
-                      Value="Auto" />
-              <Setter TargetName="secondContentColumn"
-                      Property="Width"
-                      Value="*" />
-              <Setter TargetName="contentPresenter"
-                      Property="Grid.Column"
-                      Value="1" />
-              <Setter TargetName="gridContent"
-                      Property="Grid.Column"
-                      Value="0" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
deleted file mode 100644
index 914e129c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
+++ /dev/null
@@ -1,137 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Generic/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- ButtonSpinner                                                                   -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <Style TargetType="{x:Type local:ButtonSpinner}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="IsTabStop"
-            Value="True" />
-    <Setter Property="Padding"
-            Value="1" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
-          <Border x:Name="Border"
-                  SnapsToDevicePixels="True"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition x:Name="firstContentColumn"
-                                  Width="*" />
-                <ColumnDefinition x:Name="secondContentColumn"
-                                  Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <ContentPresenter x:Name="contentPresenter"
-                                Focusable="False"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-              <Grid x:Name="gridContent"
-                    Grid.Column="1"
-                    Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}"
-                    Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-
-                <RepeatButton x:Name="PART_IncreaseButton"
-                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                              IsTabStop="{TemplateBinding IsTabStop}"
-                              ContentTemplate="{StaticResource IncreaseGlyphNormalKey}">
-                </RepeatButton>
-
-                <RepeatButton x:Name="PART_DecreaseButton"
-                              Grid.Row="1"
-                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                              IsTabStop="{TemplateBinding IsTabStop}"
-                              ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" >
-                </RepeatButton>
-
-              </Grid>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-            </Trigger>
-            <Trigger SourceName="PART_IncreaseButton"
-                     Property="IsEnabled"
-                     Value="False">
-              <Setter TargetName="PART_IncreaseButton"
-                      Property="ContentTemplate"
-                      Value="{StaticResource IncreaseGlyphDisabledKey}" />
-            </Trigger>
-            <Trigger SourceName="PART_DecreaseButton"
-                     Property="IsEnabled"
-                     Value="False">
-              <Setter TargetName="PART_DecreaseButton"
-                      Property="ContentTemplate"
-                      Value="{StaticResource DecreaseGlyphDisabledKey}" />
-            </Trigger>
-            <Trigger Property="ButtonSpinnerLocation"
-                     Value="Left">
-              <Setter TargetName="firstContentColumn"
-                      Property="Width"
-                      Value="Auto" />
-              <Setter TargetName="secondContentColumn"
-                      Property="Width"
-                      Value="*" />
-              <Setter TargetName="contentPresenter"
-                      Property="Grid.Column"
-                      Value="1" />
-              <Setter TargetName="gridContent"
-                      Property="Grid.Column"
-                      Value="0" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
deleted file mode 100644
index cf268030..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
+++ /dev/null
@@ -1,582 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_CalculatorButtonPanel, Type = typeof( ContentControl ) )]
-  public class Calculator : Control
-  {
-    private const string PART_CalculatorButtonPanel = "PART_CalculatorButtonPanel";
-
-    #region Members
-
-    private ContentControl _buttonPanel;
-    private bool _showNewNumber = true;
-    private decimal _previousValue;
-    private Operation _lastOperation = Operation.None;
-    private readonly Dictionary<Button, DispatcherTimer> _timers = new Dictionary<Button, DispatcherTimer>();
-
-    #endregion //Members
-
-    #region Enumerations
-
-    public enum CalculatorButtonType
-    {
-      Add,
-      Back,
-      Cancel,
-      Clear,
-      Decimal,
-      Divide,
-      Eight,
-      Equal,
-      Five,
-      Four,
-      Fraction,
-      MAdd,
-      MC,
-      MR,
-      MS,
-      MSub,
-      Multiply,
-      Negate,
-      Nine,
-      None,
-      One,
-      Percent,
-      Seven,
-      Six,
-      Sqrt,
-      Subtract,
-      Three,
-      Two,
-      Zero
-    }
-
-    public enum Operation
-    {
-      Add,
-      Subtract,
-      Divide,
-      Multiply,
-      Percent,
-      Sqrt,
-      Fraction,
-      None,
-      Clear,
-      Negate
-    }
-
-    #endregion //Enumerations
-
-    #region Properties
-
-    #region CalculatorButtonPanelTemplate
-
-    public static readonly DependencyProperty CalculatorButtonPanelTemplateProperty = DependencyProperty.Register( "CalculatorButtonPanelTemplate"
-      , typeof( ControlTemplate ), typeof( Calculator ), new UIPropertyMetadata( null ) );
-    public ControlTemplate CalculatorButtonPanelTemplate
-    {
-      get
-      {
-        return (ControlTemplate)GetValue( CalculatorButtonPanelTemplateProperty );
-      }
-      set
-      {
-        SetValue( CalculatorButtonPanelTemplateProperty, value );
-      }
-    }
-
-    #endregion //CalculatorButtonPanelTemplate
-
-    #region CalculatorButtonType
-
-    public static readonly DependencyProperty CalculatorButtonTypeProperty = DependencyProperty.RegisterAttached( "CalculatorButtonType", typeof( CalculatorButtonType ), typeof( Calculator ), new UIPropertyMetadata( CalculatorButtonType.None, OnCalculatorButtonTypeChanged ) );
-    public static CalculatorButtonType GetCalculatorButtonType( DependencyObject target )
-    {
-      return ( CalculatorButtonType )target.GetValue( CalculatorButtonTypeProperty );
-    }
-    public static void SetCalculatorButtonType( DependencyObject target, CalculatorButtonType value )
-    {
-      target.SetValue( CalculatorButtonTypeProperty, value );
-    }
-    private static void OnCalculatorButtonTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      OnCalculatorButtonTypeChanged( o, ( CalculatorButtonType )e.OldValue, ( CalculatorButtonType )e.NewValue );
-    }
-    private static void OnCalculatorButtonTypeChanged( DependencyObject o, CalculatorButtonType oldValue, CalculatorButtonType newValue )
-    {
-      Button button = o as Button;
-      button.CommandParameter = newValue;
-      if( button.Content == null )
-      {
-        button.Content = CalculatorUtilities.GetCalculatorButtonContent( newValue );
-      }
-    }
-
-    #endregion //CalculatorButtonType
-
-    #region DisplayText
-
-    public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register( "DisplayText", typeof( string ), typeof( Calculator ), new UIPropertyMetadata( "0", OnDisplayTextChanged ) );
-    public string DisplayText
-    {
-      get
-      {
-        return ( string )GetValue( DisplayTextProperty );
-      }
-      set
-      {
-        SetValue( DisplayTextProperty, value );
-      }
-    }
-
-    private static void OnDisplayTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Calculator calculator = o as Calculator;
-      if( calculator != null )
-        calculator.OnDisplayTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnDisplayTextChanged( string oldValue, string newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //DisplayText
-
-    #region Memory
-
-    public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register( "Memory", typeof( decimal ), typeof( Calculator ), new UIPropertyMetadata( default( decimal ) ) );
-    public decimal Memory
-    {
-      get
-      {
-        return ( decimal )GetValue( MemoryProperty );
-      }
-      set
-      {
-        SetValue( MemoryProperty, value );
-      }
-    }
-
-    #endregion //Memory
-
-    #region Precision
-
-    public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register( "Precision", typeof( int ), typeof( Calculator ), new UIPropertyMetadata( 6 ) );
-    public int Precision
-    {
-      get
-      {
-        return ( int )GetValue( PrecisionProperty );
-      }
-      set
-      {
-        SetValue( PrecisionProperty, value );
-      }
-    }
-
-    #endregion //Precision
-
-    #region Value
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( decimal? ), typeof( Calculator ), new FrameworkPropertyMetadata( default( decimal ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
-    public decimal? Value
-    {
-      get
-      {
-        return ( decimal? )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Calculator calculator = o as Calculator;
-      if( calculator != null )
-        calculator.OnValueChanged( ( decimal? )e.OldValue, ( decimal? )e.NewValue );
-    }
-
-    protected virtual void OnValueChanged( decimal? oldValue, decimal? newValue )
-    {
-      SetDisplayText( newValue );
-
-      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
-      args.RoutedEvent = ValueChangedEvent;
-      RaiseEvent( args );
-    }
-
-    #endregion //Value
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static Calculator()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( Calculator ), new FrameworkPropertyMetadata( typeof( Calculator ) ) );
-    }
-
-    public Calculator()
-    {
-
-      CommandBindings.Add( new CommandBinding( CalculatorCommands.CalculatorButtonClick, ExecuteCalculatorButtonClick ) );
-      AddHandler( MouseDownEvent, new MouseButtonEventHandler( Calculator_OnMouseDown ), true );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      _buttonPanel = GetTemplateChild( PART_CalculatorButtonPanel ) as ContentControl;
-    }
-
-    protected override void OnTextInput( TextCompositionEventArgs e )
-    {
-      var buttonType = CalculatorUtilities.GetCalculatorButtonTypeFromText( e.Text );
-      if( buttonType != CalculatorButtonType.None )
-      {
-        SimulateCalculatorButtonClick( buttonType );
-        ProcessCalculatorButton( buttonType );
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void Calculator_OnMouseDown( object sender, MouseButtonEventArgs e )
-    {
-      if( !IsFocused )
-      {
-        Focus();
-        e.Handled = true;
-      }
-    }
-
-    void Timer_Tick( object sender, EventArgs e )
-    {
-      DispatcherTimer timer = ( DispatcherTimer )sender;
-      timer.Stop();
-      timer.Tick -= Timer_Tick;
-
-      if( _timers.ContainsValue( timer ) )
-      {
-        var button = _timers.Where( x => x.Value == timer ).Select( x => x.Key ).FirstOrDefault();
-        if( button != null )
-        {
-          VisualStateManager.GoToState( button, button.IsMouseOver ? "MouseOver" : "Normal", true );
-          _timers.Remove( button );
-        }
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    internal void InitializeToValue(decimal? value)
-    {
-      _previousValue = 0;
-      _lastOperation = Operation.None;
-      _showNewNumber = true;
-      Value = value;
-      // Since the display text may be out of sync
-      // with "Value", this call will force the
-      // text update if Value was already equal to
-      // the value parameter.
-      this.SetDisplayText( value );
-    }
-
-    private void Calculate()
-    {
-      if( _lastOperation == Operation.None )
-        return;
-
-      try
-      {
-        Value = Decimal.Round( CalculateValue( _lastOperation ), Precision );
-        SetDisplayText( Value ); //Set DisplayText even when Value doesn't change
-      }
-      catch
-      {
-        Value = null;
-        DisplayText = "ERROR";
-      }
-    }
-
-    private void SetDisplayText( decimal? newValue )
-    {
-      if( newValue.HasValue && ( newValue.Value != 0 ) )
-        DisplayText = newValue.ToString();
-      else
-        DisplayText = "0";
-    }
-
-    private void Calculate( Operation newOperation )
-    {
-      if( !_showNewNumber )
-        Calculate();
-
-      _lastOperation = newOperation;
-    }
-
-    private void Calculate( Operation currentOperation, Operation newOperation )
-    {
-      _lastOperation = currentOperation;
-      Calculate();
-      _lastOperation = newOperation;
-    }
-
-    private decimal CalculateValue( Operation operation )
-    {
-      decimal newValue = decimal.Zero;
-      decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
-
-      switch( operation )
-      {
-        case Operation.Add:
-          newValue = CalculatorUtilities.Add( _previousValue, currentValue );
-          break;
-        case Operation.Subtract:
-          newValue = CalculatorUtilities.Subtract( _previousValue, currentValue );
-          break;
-        case Operation.Multiply:
-          newValue = CalculatorUtilities.Multiply( _previousValue, currentValue );
-          break;
-        case Operation.Divide:
-          newValue = CalculatorUtilities.Divide( _previousValue, currentValue );
-          break;
-        //case Operation.Percent:
-        //    newValue = CalculatorUtilities.Percent(_previousValue, currentValue);
-        //    break;
-        case Operation.Sqrt:
-          newValue = CalculatorUtilities.SquareRoot( currentValue );
-          break;
-        case Operation.Fraction:
-          newValue = CalculatorUtilities.Fraction( currentValue );
-          break;
-        case Operation.Negate:
-          newValue = CalculatorUtilities.Negate( currentValue );
-          break;
-        default:
-          newValue = decimal.Zero;
-          break;
-      }
-
-      return newValue;
-    }
-
-    void ProcessBackKey()
-    {
-      string displayText;
-      if( DisplayText.Length > 1 && !( DisplayText.Length == 2 && DisplayText[ 0 ] == '-' ) )
-      {
-        displayText = DisplayText.Remove( DisplayText.Length - 1, 1 );
-      }
-      else
-      {
-        displayText = "0";
-        _showNewNumber = true;
-      }
-
-      DisplayText = displayText;
-    }
-
-    private void ProcessCalculatorButton( CalculatorButtonType buttonType )
-    {
-      if( CalculatorUtilities.IsDigit( buttonType ) )
-        ProcessDigitKey( buttonType );
-      else if( ( CalculatorUtilities.IsMemory( buttonType ) ) )
-        ProcessMemoryKey( buttonType );
-      else
-        ProcessOperationKey( buttonType );
-    }
-
-    private void ProcessDigitKey( CalculatorButtonType buttonType )
-    {
-      if( _showNewNumber )
-        DisplayText = CalculatorUtilities.GetCalculatorButtonContent( buttonType );
-      else
-        DisplayText += CalculatorUtilities.GetCalculatorButtonContent( buttonType );
-
-      _showNewNumber = false;
-    }
-
-    private void ProcessMemoryKey( Calculator.CalculatorButtonType buttonType )
-    {
-      decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
-
-      _showNewNumber = true;
-
-      switch( buttonType )
-      {
-        case Calculator.CalculatorButtonType.MAdd:
-          Memory += currentValue;
-          break;
-        case Calculator.CalculatorButtonType.MC:
-          Memory = decimal.Zero;
-          break;
-        case Calculator.CalculatorButtonType.MR:
-          DisplayText = Memory.ToString();
-          _showNewNumber = false;
-          break;
-        case Calculator.CalculatorButtonType.MS:
-          Memory = currentValue;
-          break;
-        case Calculator.CalculatorButtonType.MSub:
-          Memory -= currentValue;
-          break;
-        default:
-          break;
-      }
-    }
-
-    private void ProcessOperationKey( CalculatorButtonType buttonType )
-    {
-      switch( buttonType )
-      {
-        case CalculatorButtonType.Add:
-          Calculate( Operation.Add );
-          break;
-        case CalculatorButtonType.Subtract:
-          Calculate( Operation.Subtract );
-          break;
-        case CalculatorButtonType.Multiply:
-          Calculate( Operation.Multiply );
-          break;
-        case CalculatorButtonType.Divide:
-          Calculate( Operation.Divide );
-          break;
-        case CalculatorButtonType.Percent:
-          if( _lastOperation != Operation.None )
-          {
-            decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
-            decimal newValue = CalculatorUtilities.Percent( _previousValue, currentValue );
-            DisplayText = newValue.ToString();
-          }
-          else
-          {
-            DisplayText = "0";
-            _showNewNumber = true;
-          }
-          return;
-        case CalculatorButtonType.Sqrt:
-          Calculate( Operation.Sqrt, Operation.None );
-          break;
-        case CalculatorButtonType.Fraction:
-          Calculate( Operation.Fraction, Operation.None );
-          break;
-        case CalculatorButtonType.Negate:
-          Calculate( Operation.Negate, Operation.None );
-          break;
-        case CalculatorButtonType.Equal:
-          Calculate( Operation.None );
-          break;
-        case CalculatorButtonType.Clear:
-          Calculate( Operation.Clear, Operation.None );
-          break;
-        case CalculatorButtonType.Cancel:
-          DisplayText = _previousValue.ToString();
-          _lastOperation = Operation.None;
-          _showNewNumber = true;
-          return;
-        case CalculatorButtonType.Back:
-          ProcessBackKey();
-          return;
-        default:
-          break;
-      }
-
-      Decimal.TryParse( DisplayText, out _previousValue );
-      _showNewNumber = true;
-    }
-
-    private void SimulateCalculatorButtonClick( CalculatorButtonType buttonType )
-    {
-      var button = CalculatorUtilities.FindButtonByCalculatorButtonType( _buttonPanel, buttonType );
-      if( button != null )
-      {
-        VisualStateManager.GoToState( button, "Pressed", true );
-        DispatcherTimer timer;
-        if( _timers.ContainsKey( button ) )
-        {
-          timer = _timers[ button ];
-          timer.Stop();
-        }
-        else
-        {
-          timer = new DispatcherTimer();
-          timer.Interval = TimeSpan.FromMilliseconds( 100 );
-          timer.Tick += Timer_Tick;
-          _timers.Add( button, timer );
-        }
-
-        timer.Start();
-      }
-    }
-
-    #endregion //Methods
-
-    #region Events
-
-    //Due to a bug in Visual Studio, you cannot create event handlers for nullable args in XAML, so I have to use object instead.
-    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( Calculator ) );
-    public event RoutedPropertyChangedEventHandler<object> ValueChanged
-    {
-      add
-      {
-        AddHandler( ValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ValueChangedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Commands
-
-    private void ExecuteCalculatorButtonClick( object sender, ExecutedRoutedEventArgs e )
-    {
-      var buttonType = ( CalculatorButtonType )e.Parameter;
-      ProcessCalculatorButton( buttonType );
-    }
-
-    #endregion //Commands
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
deleted file mode 100644
index d24c8e08..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public static class CalculatorCommands
-  {
-    private static RoutedCommand _calculatorButtonClickCommand = new RoutedCommand();
-
-    public static RoutedCommand CalculatorButtonClick
-    {
-      get
-      {
-        return _calculatorButtonClickCommand;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 6058039e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,406 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
-
-  <Style x:Key="CalculatorOperatorButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Focusable"
-            Value="False" />
-  </Style>
-
-  <Style x:Key="CalculatorClearButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Background"
-            Value="Pink" />
-  </Style>
-
-  <Style x:Key="CalculatorDigitButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Background"
-            Value="#FFE8E8E8" />
-  </Style>
-
-
-  <ControlTemplate x:Key="CalculatorButtonPanel"
-                   TargetType="{x:Type ContentControl}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="3" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="3" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="3" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="3" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-        <RowDefinition />
-        <RowDefinition Height="3" />
-        <RowDefinition />
-        <RowDefinition Height="3" />
-        <RowDefinition />
-        <RowDefinition Height="3" />
-        <RowDefinition />
-        <RowDefinition Height="3" />
-        <RowDefinition />
-        <RowDefinition Height="3" />
-        <RowDefinition />
-      </Grid.RowDefinitions>
-      <Button Grid.Column="0"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MC"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MR"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Back"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}"
-              Grid.RowSpan="1">
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Cancel"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorClearButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Clear"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorClearButtonStyle}"
-              Grid.ColumnSpan="1"
-              Grid.RowSpan="1">
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MS"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MAdd"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}"
-              Margin="0">
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MSub"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Negate"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Sqrt"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Seven"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Eight"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Nine"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Divide"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Percent"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Four"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Five"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Six"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Multiply"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Fraction"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="One"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Two"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Three"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Subtract"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="8"
-              Grid.RowSpan="3"
-              MinWidth="28"
-              MinHeight="55"
-              local:Calculator.CalculatorButtonType="Equal"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="10"
-              Grid.ColumnSpan="3"
-              MinWidth="59"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Zero"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="10"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Decimal"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="10"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Add"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-    </Grid>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:Calculator}">
-    <Setter Property="Background"
-            Value="{StaticResource PanelBackgroundBrush}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:Calculator}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="0">
-            <Grid Margin="10">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-              </Grid.RowDefinitions>
-              <Border x:Name="PART_Display"
-                      Margin="0,0,0,10"
-                      Background="White"
-                      BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}"
-                      BorderThickness="1">
-                <StackPanel>
-                  <Path Stretch="Fill"
-                        Height="9"
-                        Width="9"
-                        Fill="DarkGray"
-                        Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Margin="4,4,0,0"
-                        Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
-                  <TextBlock FontSize="18"
-                             HorizontalAlignment="Right"
-                             Margin="0,0,4,0"
-                             Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}">
-                  </TextBlock>
-                </StackPanel>
-              </Border>
-              <ContentControl x:Name="PART_CalculatorButtonPanel"
-                              Grid.Row="1"
-                              Template="{Binding CalculatorButtonPanelTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource CalculatorButtonPanel}}"
-                              DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsFocused"
-                     Value="True">
-              <Setter TargetName="PART_Display"
-                      Property="Background"
-                      Value="Azure" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
deleted file mode 100644
index ad78aba3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
+++ /dev/null
@@ -1,830 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <conv:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
-
-  <Style x:Key="CalculatorOperatorButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="#FF5B636E" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Button}">
-          <Grid x:Name="Control">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_MouseOver"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Pressed"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="contentPresenter"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="MemoryStates">
-                <VisualState x:Name="EmptyMemory" />
-                <VisualState x:Name="MemoryAssigned">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Border1"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Border2"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border Background="White"
-                    BorderBrush="{x:Null}"
-                    BorderThickness="0"
-                    CornerRadius="2"
-                    Margin="0,0,0,-1"
-                    Opacity="0.5" />
-            <Grid x:Name="PART_Default">
-              <Border BorderThickness="0"
-                      CornerRadius="2"
-                      Background="#FF9CA2AB">
-                <Grid>
-                  <Border x:Name="PART_Border1"
-                          BorderThickness="0"
-                          CornerRadius="1"
-                          Margin="1">
-                    <Border.Background>
-                      <LinearGradientBrush EndPoint="0.5,1"
-                                           StartPoint="0.5,0">
-                        <GradientStop Color="#FFEDF1F7"
-                                      Offset="0" />
-                        <GradientStop Color="#FFD5DBE3"
-                                      Offset="1" />
-                      </LinearGradientBrush>
-                    </Border.Background>
-                    <Border BorderThickness="0"
-                            CornerRadius="1"
-                            Margin="2">
-                      <Border.Background>
-                        <LinearGradientBrush EndPoint="0.5,1"
-                                             StartPoint="0.5,0">
-                          <GradientStop Color="#FFEDF1F7"
-                                        Offset="0" />
-                          <GradientStop Color="#FFD5DBE3"
-                                        Offset="1" />
-                        </LinearGradientBrush>
-                      </Border.Background>
-                    </Border>
-                  </Border>
-                  <Border x:Name="PART_Border2"
-                          BorderThickness="0"
-                          CornerRadius="1"
-                          Margin="1"
-                          Opacity="0">
-                    <Border.Background>
-                      <LinearGradientBrush EndPoint="0.5,1"
-                                           StartPoint="0.5,0">
-                        <GradientStop Color="#FF9CA2AB"
-                                      Offset="0" />
-                        <GradientStop Color="#FF9CA2AB"
-                                      Offset="1" />
-                      </LinearGradientBrush>
-                    </Border.Background>
-                    <Border BorderThickness="0"
-                            CornerRadius="1"
-                            Margin="2">
-                      <Border.Background>
-                        <LinearGradientBrush EndPoint="0.5,1"
-                                             StartPoint="0.5,0">
-                          <GradientStop Color="#FFEDF1F7"
-                                        Offset="0" />
-                          <GradientStop Color="#FFD5DBE3"
-                                        Offset="1" />
-                        </LinearGradientBrush>
-                      </Border.Background>
-                    </Border>
-                  </Border>
-                </Grid>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_MouseOver"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2"
-                      Background="#FF9CA2AB">
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1">
-                  <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1"
-                                         StartPoint="0.5,0">
-                      <GradientStop Color="#FFFDFEFF"
-                                    Offset="0" />
-                      <GradientStop Color="#FFD9DFE8"
-                                    Offset="1" />
-                    </LinearGradientBrush>
-                  </Border.Background>
-                </Border>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_Pressed"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2"
-                      Background="#FF90959D">
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1"
-                        Background="#FFB5BBC5" />
-              </Border>
-            </Grid>
-            <ContentPresenter x:Name="contentPresenter"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="CalculatorClearButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="#FFBF5254" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Button}">
-          <Grid x:Name="Control">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_MouseOver"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Pressed"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="contentPresenter"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border Background="White"
-                    BorderBrush="{x:Null}"
-                    BorderThickness="0"
-                    CornerRadius="2"
-                    Margin="0,0,0,-1"
-                    Opacity="0.5" />
-            <Grid x:Name="PART_Default">
-              <Border BorderThickness="0"
-                      CornerRadius="2">
-                <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                    <GradientStop Color="#FFC19497"
-                                  Offset="0" />
-                    <GradientStop Color="#FFA67D80"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Border.Background>
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1">
-                  <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1"
-                                         StartPoint="0.5,0">
-                      <GradientStop Color="#FFFDB8B8"
-                                    Offset="0" />
-                      <GradientStop Color="#FFF39998"
-                                    Offset="1" />
-                    </LinearGradientBrush>
-                  </Border.Background>
-                </Border>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_MouseOver"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2">
-                <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                    <GradientStop Color="#FFC19497"
-                                  Offset="0" />
-                    <GradientStop Color="#FFA67D80"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Border.Background>
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1">
-                  <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1"
-                                         StartPoint="0.5,0">
-                      <GradientStop Color="#FFFEC9C9"
-                                    Offset="0" />
-                      <GradientStop Color="#FFEAA4A3"
-                                    Offset="1" />
-                    </LinearGradientBrush>
-                  </Border.Background>
-                </Border>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_Pressed"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2"
-                      Background="#FF9B6F72">
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1"
-                        Background="#FFE69197" />
-              </Border>
-            </Grid>
-            <ContentPresenter x:Name="contentPresenter"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="CalculatorDigitButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="#FF2A313A" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Button}">
-          <Grid x:Name="Control">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_MouseOver"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Pressed"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="contentPresenter"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border BorderBrush="{x:Null}"
-                    BorderThickness="0"
-                    Background="White"
-                    CornerRadius="3"
-                    Margin="0,0,0,-1"
-                    Opacity="0.5" />
-            <Grid x:Name="PART_Default">
-              <Border BorderThickness="0"
-                      CornerRadius="2">
-                <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                    <GradientStop Color="#FFA9AAAB"
-                                  Offset="0" />
-                    <GradientStop Color="#FF98999A"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Border.Background>
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1">
-                  <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1"
-                                         StartPoint="0.5,0">
-                      <GradientStop Color="#FFF6F7F7"
-                                    Offset="0" />
-                      <GradientStop Color="#FFDEE0E2"
-                                    Offset="1" />
-                    </LinearGradientBrush>
-                  </Border.Background>
-                </Border>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_MouseOver"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2">
-                <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                    <GradientStop Color="#FFA9AAAB"
-                                  Offset="0" />
-                    <GradientStop Color="#FF98999A"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Border.Background>
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1">
-                  <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1"
-                                         StartPoint="0.5,0">
-                      <GradientStop Color="#FFFCFCFC"
-                                    Offset="0" />
-                      <GradientStop Color="#FFEEEFF2"
-                                    Offset="1" />
-                    </LinearGradientBrush>
-                  </Border.Background>
-                </Border>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_Pressed"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2"
-                      Background="#FF87888A">
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1"
-                        Background="#FFB5BBC5" />
-              </Border>
-            </Grid>
-            <ContentPresenter x:Name="contentPresenter"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-
-  <ControlTemplate x:Key="CalculatorButtonPanel"
-                   TargetType="{x:Type ContentControl}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="3" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="3" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="3" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="3" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-        <RowDefinition />
-        <RowDefinition Height="3" />
-        <RowDefinition />
-        <RowDefinition Height="3" />
-        <RowDefinition />
-        <RowDefinition Height="3" />
-        <RowDefinition />
-        <RowDefinition Height="3" />
-        <RowDefinition />
-        <RowDefinition Height="3" />
-        <RowDefinition />
-      </Grid.RowDefinitions>
-      <Button Grid.Column="0"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MC"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MR"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Back"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}"
-              Grid.RowSpan="1" >
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Cancel"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorClearButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Clear"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorClearButtonStyle}"
-              Grid.ColumnSpan="1"
-              Grid.RowSpan="1" >
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MS"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MAdd"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}"
-              Margin="0" >
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MSub"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Negate"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Sqrt"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Seven"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Eight"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Nine"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Divide"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Percent"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Four"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Five"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Six"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Multiply"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Fraction"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="One"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Two"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Three"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Subtract"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="8"
-              Grid.RowSpan="3"
-              MinWidth="28"
-              MinHeight="55"
-              local:Calculator.CalculatorButtonType="Equal"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="10"
-              Grid.ColumnSpan="3"
-              MinWidth="59"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Zero"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="10"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Decimal"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="10"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Add"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-    </Grid>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:Calculator}">
-    <Setter Property="Background">
-      <Setter.Value>
-        <LinearGradientBrush EndPoint="0.5,1"
-                             StartPoint="0.5,0">
-          <GradientStop Color="#FFFAFBFB"
-                        Offset="0" />
-          <GradientStop Color="#FFF4F4F4"
-                        Offset="1" />
-        </LinearGradientBrush>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="BorderBrush"
-            Value="#FF949494" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:Calculator}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="3">
-            <Grid Margin="10">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-              </Grid.RowDefinitions>
-              <Border x:Name="PART_Display"
-                      Margin="0,0,0,10"
-                      Background="White"
-                      BorderBrush="#FF949494"
-                      BorderThickness="1">
-                <StackPanel>
-                  <Path Stretch="Fill"
-                        Height="9"
-                        Width="9"
-                        Fill="DarkGray"
-                        Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Margin="4,4,0,0"
-                        Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
-                  <TextBlock FontSize="18"
-                             HorizontalAlignment="Right"
-                             Margin="0,0,4,0"
-                             Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" >
-                  </TextBlock>
-                </StackPanel>
-              </Border>
-              <ContentControl x:Name="PART_CalculatorButtonPanel"
-                              Grid.Row="1"
-                              Template="{Binding CalculatorButtonPanelTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource CalculatorButtonPanel}}"
-                              DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsFocused"
-                     Value="True">
-              <Setter TargetName="PART_Display"
-                      Property="Background"
-                      Value="#E7F5FF" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
deleted file mode 100644
index 8e7fd013..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_CalculatorPopup, Type = typeof( Popup ) )]
-  [TemplatePart( Name = PART_Calculator, Type = typeof( Calculator ) )]
-  public class CalculatorUpDown : DecimalUpDown
-  {
-    private const string PART_CalculatorPopup = "PART_CalculatorPopup";
-    private const string PART_Calculator = "PART_Calculator";
-
-    #region Members
-
-    private Popup _calculatorPopup;
-    private Calculator _calculator;
-    private Decimal? _initialValue;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region DisplayText
-
-    public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register( "DisplayText", typeof( string ), typeof( CalculatorUpDown ), new UIPropertyMetadata( "0" ) );
-    public string DisplayText
-    {
-      get
-      {
-        return ( string )GetValue( DisplayTextProperty );
-      }
-      set
-      {
-        SetValue( DisplayTextProperty, value );
-      }
-    }
-
-    #endregion //DisplayText
-
-    #region EnterClosesCalculator
-
-    public static readonly DependencyProperty EnterClosesCalculatorProperty = DependencyProperty.Register( "EnterClosesCalculator", typeof( bool ), typeof( CalculatorUpDown ), new UIPropertyMetadata( false ) );
-    public bool EnterClosesCalculator
-    {
-      get
-      {
-        return ( bool )GetValue( EnterClosesCalculatorProperty );
-      }
-      set
-      {
-        SetValue( EnterClosesCalculatorProperty, value );
-      }
-    }
-
-    #endregion //EnterClosesCalculator
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( CalculatorUpDown ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      CalculatorUpDown calculatorUpDown = o as CalculatorUpDown;
-      if( calculatorUpDown != null )
-        calculatorUpDown.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-        _initialValue = this.UpdateValueOnEnterKey ? this.ConvertTextToValue( this.TextBox.Text ) : this.Value;
-    }
-
-    #endregion //IsOpen
-
-    #region Memory
-
-    public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register( "Memory", typeof( decimal ), typeof( CalculatorUpDown ), new UIPropertyMetadata( default( decimal ) ) );
-    public decimal Memory
-    {
-      get
-      {
-        return ( decimal )GetValue( MemoryProperty );
-      }
-      set
-      {
-        SetValue( MemoryProperty, value );
-      }
-    }
-
-    #endregion //Memory
-
-    #region Precision
-
-    public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register( "Precision", typeof( int ), typeof( CalculatorUpDown ), new UIPropertyMetadata( 6 ) );
-    public int Precision
-    {
-      get
-      {
-        return ( int )GetValue( PrecisionProperty );
-      }
-      set
-      {
-        SetValue( PrecisionProperty, value );
-      }
-    }
-
-    #endregion //Precision
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static CalculatorUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CalculatorUpDown ), new FrameworkPropertyMetadata( typeof( CalculatorUpDown ) ) );
-    }
-
-    public CalculatorUpDown()
-    {
-      Keyboard.AddKeyDownHandler( this, OnKeyDown );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _calculatorPopup != null )
-        _calculatorPopup.Opened -= CalculatorPopup_Opened;
-
-      _calculatorPopup = GetTemplateChild( PART_CalculatorPopup ) as Popup;
-
-      if( _calculatorPopup != null )
-        _calculatorPopup.Opened += CalculatorPopup_Opened;
-
-      if( _calculator != null )
-        _calculator.ValueChanged -= OnCalculatorValueChanged;
-
-      _calculator = GetTemplateChild( PART_Calculator ) as Calculator;
-
-      if( _calculator != null )
-        _calculator.ValueChanged += OnCalculatorValueChanged;
-    }
-
-    private void OnCalculatorValueChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
-    {
-      if( _calculator != null )
-      {
-        if( this.IsBetweenMinMax( _calculator.Value ) )
-        {
-          if( this.UpdateValueOnEnterKey )
-          {
-            this.TextBox.Text = ( _calculator.Value != null ) ? _calculator.Value.Value.ToString( this.FormatString, this.CultureInfo ) : null;
-          }
-          else
-          {
-            this.Value = _calculator.Value;
-          }
-        }
-      }
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    void CalculatorPopup_Opened( object sender, EventArgs e )
-    {
-      if( _calculator != null )
-      {
-        var initValue = this.UpdateValueOnEnterKey ? this.ConvertTextToValue( this.TextBox.Text ) : this.Value;
-        _calculator.InitializeToValue( initValue );
-        _calculator.Focus();
-      }
-    }
-
-    protected override void OnTextInput( TextCompositionEventArgs e )
-    {
-      if( IsOpen && EnterClosesCalculator )
-      {
-        var buttonType = CalculatorUtilities.GetCalculatorButtonTypeFromText( e.Text );
-        if( buttonType == Calculator.CalculatorButtonType.Equal )
-        {
-          CloseCalculatorUpDown( true );
-        }
-      }
-    }
-
-    private void OnKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsOpen = true;
-          // Calculator will get focus in CalculatorPopup_Opened().
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          CloseCalculatorUpDown( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Escape )
-        {
-          if( EnterClosesCalculator )
-          {
-            if( this.UpdateValueOnEnterKey )
-            {
-              this.TextBox.Text = (_initialValue != null) ? _initialValue.Value.ToString( this.FormatString, this.CultureInfo ) : null;
-            }
-            else
-            {
-              this.Value = _initialValue;
-            }
-          }
-          CloseCalculatorUpDown( true );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      CloseCalculatorUpDown( true );
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void CloseCalculatorUpDown( bool isFocusOnTextBox )
-    {
-      if( IsOpen )
-        IsOpen = false;
-      ReleaseMouseCapture();
-
-      if( isFocusOnTextBox && ( TextBox != null ) )
-        TextBox.Focus();
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 0160991c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,222 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                    Focusable="False"
-                    Margin="0,0,3,0" />
-  </DataTemplate>
-
-  <Style x:Key="CalculatorToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                 CornerRadius="0"
-                                 RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
-                                 RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
-                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                 RenderPressed="{TemplateBinding IsPressed}">
-
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter HorizontalAlignment="Stretch"
-                                  VerticalAlignment="Stretch"
-                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-            </chrome:ButtonChrome>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- =============================================================================== -->
-  <!-- CalculatorUpDown                                                                -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:CalculatorUpDown}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
-          <Grid>
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <local:ButtonSpinner x:Name="PART_Spinner"
-                                   IsTabStop="False"
-                                   Background="{TemplateBinding Background}"
-                                   BorderThickness="{TemplateBinding BorderThickness}"
-                                   BorderBrush="{TemplateBinding BorderBrush}"
-                                   ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                   AllowSpin="{TemplateBinding AllowSpin}"
-                                   ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
-                                   VerticalContentAlignment="Stretch"
-                                   HorizontalAlignment="Stretch">
-                <local:WatermarkTextBox x:Name="PART_TextBox"
-                                        BorderThickness="0"
-                                        Background="{TemplateBinding Background}"
-                                        ContextMenu="{TemplateBinding ContextMenu}"
-                                        FontFamily="{TemplateBinding FontFamily}"
-                                        FontSize="{TemplateBinding FontSize}"
-                                        FontStretch="{TemplateBinding FontStretch}"
-                                        FontStyle="{TemplateBinding FontStyle}"
-                                        FontWeight="{TemplateBinding FontWeight}"
-                                        Foreground="{TemplateBinding Foreground}"
-                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                        IsTabStop="True"
-                                        MinWidth="20"
-                                        AcceptsReturn="False"
-                                        Padding="{TemplateBinding Padding}"
-                                        AutoSelectBehavior="{TemplateBinding AutoSelectBehavior}"
-                                        AutoMoveFocus="{TemplateBinding AutoMoveFocus}"
-                                        TextAlignment="{TemplateBinding TextAlignment}"
-                                        TextWrapping="NoWrap"
-                                        TabIndex="{TemplateBinding TabIndex}"
-                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        Watermark="{TemplateBinding Watermark}"
-                                        WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-              </local:ButtonSpinner>
-              <ToggleButton x:Name="_calculatorToggleButton"
-                            Grid.Column="1"
-                            Focusable="False"
-                            IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                            Style="{StaticResource CalculatorToggleButtonStyle}"
-                            IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
-              </ToggleButton>
-            </Grid>
-            <Popup x:Name="PART_CalculatorPopup"
-                   IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
-                   StaysOpen="False"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{StaticResource PanelBackgroundBrush}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                      Padding="3">
-                <StackPanel>
-                  <local:Calculator x:Name="PART_Calculator"
-                                    Background="Transparent"
-                                    BorderThickness="0"
-                                    DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}" />
-                </StackPanel>
-              </Border>
-            </Popup>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocusWithin"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsFocused"
-                     Value="True">
-              <Setter TargetName="PART_TextBox"
-                      Property="FocusManager.FocusedElement"
-                      Value="{Binding ElementName=PART_TextBox}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
deleted file mode 100644
index 3f3b0b28..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
+++ /dev/null
@@ -1,229 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <LinearGradientBrush x:Key="PopupDarkBorderBrush"
-                       EndPoint="0.5,1"
-                       StartPoint="0.5,0">
-    <GradientStop Color="#FFA3AEB9"
-                  Offset="0" />
-    <GradientStop Color="#FF8399A9"
-                  Offset="0.375" />
-    <GradientStop Color="#FF718597"
-                  Offset="0.375" />
-    <GradientStop Color="#FF617584"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <Style x:Key="CalculatorToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                 CornerRadius="0,2.75,2.75,0"
-                                 RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
-                                 RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
-                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                 RenderPressed="{TemplateBinding IsPressed}">
-
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter HorizontalAlignment="Stretch"
-                                  VerticalAlignment="Stretch"
-                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-            </chrome:ButtonChrome>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="Gray"
-                    Focusable="False"
-                    Margin="0,0,3,0" />
-  </DataTemplate>
-
-  <!-- =============================================================================== -->
-  <!-- CalculatorUpDown                                                                -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:CalculatorUpDown}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <local:ButtonSpinner x:Name="PART_Spinner"
-                                 IsTabStop="False"
-                                 Background="{TemplateBinding Background}"
-                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                 ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                 AllowSpin="{TemplateBinding AllowSpin}"
-                                 ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
-                                 VerticalContentAlignment="Stretch"
-                                 HorizontalAlignment="Stretch">
-              <local:WatermarkTextBox x:Name="PART_TextBox"
-                                      BorderThickness="0"
-                                      Background="{TemplateBinding Background}"
-                                      ContextMenu="{TemplateBinding ContextMenu}"
-                                      FontFamily="{TemplateBinding FontFamily}"
-                                      FontSize="{TemplateBinding FontSize}"
-                                      FontStretch="{TemplateBinding FontStretch}"
-                                      FontStyle="{TemplateBinding FontStyle}"
-                                      FontWeight="{TemplateBinding FontWeight}"
-                                      Foreground="{TemplateBinding Foreground}"
-                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                      IsTabStop="True"
-                                      MinWidth="20"
-                                      AcceptsReturn="False"
-                                      Padding="{TemplateBinding Padding}"
-                                      AutoSelectBehavior="{TemplateBinding AutoSelectBehavior}"
-                                      AutoMoveFocus="{TemplateBinding AutoMoveFocus}"
-                                      TextAlignment="{TemplateBinding TextAlignment}"
-                                      TextWrapping="NoWrap"
-                                      TabIndex="{TemplateBinding TabIndex}"
-                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      Watermark="{TemplateBinding Watermark}"
-                                      WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-            </local:ButtonSpinner>
-            <ToggleButton x:Name="_calculatorToggleButton"
-                          Grid.Column="1"
-                          Focusable="False"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource CalculatorToggleButtonStyle}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" >
-            </ToggleButton>
-            <Popup x:Name="PART_CalculatorPopup"
-                   IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
-                   StaysOpen="False"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{StaticResource PopupBackgroundBrush}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                      Padding="3">
-                <StackPanel>
-                  <local:Calculator x:Name="PART_Calculator"
-                                    Background="Transparent"
-                                    BorderThickness="0"
-                                    DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}" />
-                </StackPanel>
-              </Border>
-            </Popup>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
deleted file mode 100644
index 40781ee5..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
+++ /dev/null
@@ -1,402 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Linq;
-using System.Windows;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Controls;
-using System.Collections.Generic;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_Popup, Type = typeof( Popup ) )]
-  public class CheckComboBox : SelectAllSelector
-  {
-    private const string PART_Popup = "PART_Popup";
-
-    #region Members
-
-    private ValueChangeHelper _displayMemberPathValuesChangeHelper;
-    private bool _ignoreTextValueChanged;
-    private Popup _popup;
-    private List<object> _initialValue = new List<object>();
-
-    #endregion
-
-    #region Constructors
-
-    static CheckComboBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CheckComboBox ), new FrameworkPropertyMetadata( typeof( CheckComboBox ) ) );
-    }
-
-    public CheckComboBox()
-    {
-
-      Keyboard.AddKeyDownHandler( this, OnKeyDown );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-      _displayMemberPathValuesChangeHelper = new ValueChangeHelper( this.OnDisplayMemberPathValuesChanged );
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region IsEditable
-
-    public static readonly DependencyProperty IsEditableProperty = DependencyProperty.Register( "IsEditable", typeof( bool ), typeof( CheckComboBox )
-      , new UIPropertyMetadata( false ) );
-    public bool IsEditable
-    {
-      get
-      {
-        return (bool)GetValue( IsEditableProperty );
-      }
-      set
-      {
-        SetValue( IsEditableProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( CheckComboBox )
-      , new UIPropertyMetadata( null, OnTextChanged ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var checkComboBox = o as CheckComboBox;
-      if( checkComboBox != null )
-        checkComboBox.OnTextChanged( (string)e.OldValue, (string)e.NewValue );
-    }
-
-    protected virtual void OnTextChanged( string oldValue, string newValue )
-    {
-      if( !this.IsInitialized || _ignoreTextValueChanged || !this.IsEditable )
-        return;
-
-      this.UpdateFromText();
-    }
-
-    #endregion
-
-    #region IsDropDownOpen
-
-    public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register( "IsDropDownOpen", typeof( bool ), typeof( CheckComboBox ), new UIPropertyMetadata( false, OnIsDropDownOpenChanged ) );
-    public bool IsDropDownOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsDropDownOpenProperty );
-      }
-      set
-      {
-        SetValue( IsDropDownOpenProperty, value );
-      }
-    }
-
-    private static void OnIsDropDownOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      CheckComboBox comboBox = o as CheckComboBox;
-      if( comboBox != null )
-        comboBox.OnIsDropDownOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsDropDownOpenChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-      {
-        _initialValue.Clear();
-        foreach( object o in SelectedItems )
-        {
-          _initialValue.Add( o );
-        }
-        base.RaiseEvent( new RoutedEventArgs( CheckComboBox.OpenedEvent, this ) );
-      }
-      else
-      {
-        _initialValue.Clear();
-        base.RaiseEvent( new RoutedEventArgs( CheckComboBox.ClosedEvent, this ) );
-      }
-    }
-
-    #endregion //IsDropDownOpen
-
-    #region MaxDropDownHeight
-
-    public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register( "MaxDropDownHeight", typeof( double ), typeof( CheckComboBox ), new UIPropertyMetadata( SystemParameters.PrimaryScreenHeight / 3.0, OnMaxDropDownHeightChanged ) );
-    public double MaxDropDownHeight
-    {
-      get
-      {
-        return ( double )GetValue( MaxDropDownHeightProperty );
-      }
-      set
-      {
-        SetValue( MaxDropDownHeightProperty, value );
-      }
-    }
-
-    private static void OnMaxDropDownHeightChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      CheckComboBox comboBox = o as CheckComboBox;
-      if( comboBox != null )
-        comboBox.OnMaxDropDownHeightChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    protected virtual void OnMaxDropDownHeightChanged( double oldValue, double newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion
-
-    #endregion //Properties
-
-    #region Base Class Overrides
-
-    protected override void OnSelectedValueChanged( string oldValue, string newValue )
-    {
-      base.OnSelectedValueChanged( oldValue, newValue );
-      UpdateText();
-    }
-
-    protected override void OnDisplayMemberPathChanged( string oldDisplayMemberPath, string newDisplayMemberPath )
-    {
-      base.OnDisplayMemberPathChanged( oldDisplayMemberPath, newDisplayMemberPath );
-      this.UpdateDisplayMemberPathValuesBindings();
-    }
-
-    protected override void OnItemsSourceChanged( System.Collections.IEnumerable oldValue, System.Collections.IEnumerable newValue )
-    {
-      base.OnItemsSourceChanged( oldValue, newValue );
-      this.UpdateDisplayMemberPathValuesBindings();
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _popup != null )
-        _popup.Opened -= Popup_Opened;
-
-      _popup = GetTemplateChild( PART_Popup ) as Popup;
-
-      if( _popup != null )
-        _popup.Opened += Popup_Opened;
-    }
-
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      CloseDropDown( true );
-    }
-
-    private void OnKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsDropDownOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsDropDownOpen = true;
-          // Popup_Opened() will Focus on ComboBoxItem.
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          CloseDropDown( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Enter )
-        {
-          CloseDropDown( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Escape )
-        {
-          SelectedItems.Clear();
-          foreach( object o in _initialValue )
-            SelectedItems.Add( o );
-          CloseDropDown( true );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void Popup_Opened( object sender, EventArgs e )
-    {
-      UIElement item = ItemContainerGenerator.ContainerFromItem( SelectedItem ) as UIElement;
-      if( (item == null) && (Items.Count > 0) )
-        item = ItemContainerGenerator.ContainerFromItem( Items[0] ) as UIElement;
-      if( item != null )
-        item.Focus();
-    }
-
-    #endregion //Event Handlers
-
-    #region Closed Event
-
-    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent( "Closed", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( CheckComboBox ) );
-    public event RoutedEventHandler Closed
-    {
-      add
-      {
-        AddHandler( ClosedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ClosedEvent, value );
-      }
-    }
-
-    #endregion //Closed Event
-
-    #region Opened Event
-
-    public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent( "Opened", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( CheckComboBox ) );
-    public event RoutedEventHandler Opened
-    {
-      add
-      {
-        AddHandler( OpenedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( OpenedEvent, value );
-      }
-    }
-
-    #endregion //Opened Event
-
-    #region Methods
-
-    protected virtual void UpdateText()
-    {
-#if VS2008
-      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ).ToString() ).ToArray() ); 
-#else
-      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ) ) );
-#endif
-
-      if( String.IsNullOrEmpty( Text ) || !Text.Equals( newValue ) )
-      {
-        _ignoreTextValueChanged = true;
-#if VS2008
-        Text = newValue;
-#else
-        this.SetCurrentValue( CheckComboBox.TextProperty, newValue );
-#endif
-        _ignoreTextValueChanged = false;
-      }
-    }
-
-    private void UpdateDisplayMemberPathValuesBindings()
-    {
-      _displayMemberPathValuesChangeHelper.UpdateValueSource( ItemsCollection, this.DisplayMemberPath );
-    }
-
-    private void OnDisplayMemberPathValuesChanged()
-    {
-      this.UpdateText();
-    }
-
-    /// <summary>
-    /// Updates the SelectedItems collection based on the content of
-    /// the Text property.
-    /// </summary>
-    private void UpdateFromText()
-    {
-      List<string> selectedValues = null;
-      if( !String.IsNullOrEmpty( this.Text ) )
-      {
-        selectedValues = this.Text.Replace( " ", string.Empty ).Split( new string[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries ).ToList();
-      }
-
-      this.UpdateFromList( selectedValues, this.GetItemDisplayValue );
-    }
-
-    protected object GetItemDisplayValue( object item )
-    {
-      if( String.IsNullOrEmpty( this.DisplayMemberPath ) )
-        return item;
-
-      string[] nameParts = this.DisplayMemberPath.Split( '.' );
-      if( nameParts.Length == 1 )
-      {
-        var property = item.GetType().GetProperty( this.DisplayMemberPath );
-        if( property != null )
-          return property.GetValue( item, null );
-        return item;
-      }
-
-      for( int i = 0; i < nameParts.Count(); ++i )
-      {
-        var type = item.GetType();
-        var info = type.GetProperty( nameParts[ i ] );
-        if( info == null )
-        {
-          return item;
-        }
-
-        if( i == nameParts.Count() - 1 )
-        {
-          return info.GetValue( item, null );
-        }
-        else
-        {
-          item = info.GetValue( item, null );
-        }
-      }
-      return item;
-    }
-
-    private void CloseDropDown( bool isFocusOnComboBox )
-    {
-      if( IsDropDownOpen )
-        IsDropDownOpen = false;
-      ReleaseMouseCapture();
-
-      if( isFocusOnComboBox )
-        Focus();
-    }
-
-#endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index a3921362..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,216 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-  <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
-
-  <Style x:Key="ComboBoxToggleButton"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="OverridesDefaultStyle"
-            Value="true" />
-    <Setter Property="IsTabStop"
-            Value="false" />
-    <Setter Property="Focusable"
-            Value="false" />
-    <Setter Property="Padding"
-            Value="2" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <chrome:ButtonChrome x:Name="Chrome"
-                               BorderBrush="{TemplateBinding BorderBrush}"
-                               Background="{TemplateBinding Background}"
-                               CornerRadius="0"
-                               RenderEnabled="{TemplateBinding IsEnabled}"
-                               RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
-                               RenderNormal="False"
-                               RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}"
-                               SnapsToDevicePixels="true">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"
-                                  Width="0" />
-              </Grid.ColumnDefinitions>
-
-              <TextBox x:Name="TextBox"
-                       Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                       Foreground="{TemplateBinding Foreground}"
-                       BorderThickness="0"
-                       Background="Transparent"
-                       IsReadOnly="True"
-                       Focusable="False"
-                       Cursor="Arrow"
-                       Margin="{TemplateBinding Padding}"
-                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                       HorizontalScrollBarVisibility="Hidden"
-                       VerticalScrollBarVisibility="Hidden" >
-              </TextBox>
-              <Grid Grid.Column="1"
-                    HorizontalAlignment="Right"
-                    Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                <Path x:Name="Arrow"
-                      Data="{StaticResource DownArrowGeometry}"
-                      Fill="Black"
-                      HorizontalAlignment="Center"
-                      Margin="3,0,3,0"
-                      VerticalAlignment="Center" />
-              </Grid>
-            </Grid>
-          </chrome:ButtonChrome>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked"
-                     Value="true">
-              <Setter Property="RenderPressed"
-                      TargetName="Chrome"
-                      Value="true" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="false">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-            <DataTrigger Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type local:CheckComboBox}}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="False"
-                      TargetName="TextBox" />
-              <Setter Property="Focusable"
-                      Value="True"
-                      TargetName="TextBox" />
-              <Setter Property="Cursor"
-                      Value="{x:Null}"
-                      TargetName="TextBox" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:CheckComboBox}">
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="Padding"
-            Value="2" />
-    <Setter Property="ScrollViewer.CanContentScroll"
-            Value="true" />
-    <Setter Property="Stylus.IsFlicksEnabled"
-            Value="False" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
-          <Grid x:Name="MainGrid"
-                SnapsToDevicePixels="true">
-            <Popup x:Name="PART_Popup"
-                   AllowsTransparency="true"
-                   IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                   StaysOpen="False"
-                   Margin="1"
-                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
-                   Placement="Bottom">
-              <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
-                <Border x:Name="DropDownBorder"
-                        MaxHeight="{Binding MaxDropDownHeight,  RelativeSource={RelativeSource TemplatedParent}}"
-                        BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
-                        BorderThickness="1"
-                        Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-                  <ScrollViewer x:Name="DropDownScrollViewer">
-                    <Grid>
-                      <Canvas HorizontalAlignment="Left"
-                              Height="0"
-                              VerticalAlignment="Top"
-                              Width="0">
-                        <Rectangle x:Name="OpaqueRect"
-                                   Fill="{Binding Background, ElementName=DropDownBorder}"
-                                   Height="{Binding ActualHeight, ElementName=DropDownBorder}"
-                                   Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
-                      </Canvas>
-                      <StackPanel>
-                        <prim:SelectAllSelectorItem x:Name="PART_SelectAllSelectorItem"
-                                                    Content="{TemplateBinding SelectAllContent}"
-                                                    Visibility="{Binding IsSelectAllActive, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                        <ItemsPresenter x:Name="PART_ItemsPresenter"
-                                        KeyboardNavigation.DirectionalNavigation="Contained"
-                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                      </StackPanel>
-                    </Grid>
-                  </ScrollViewer>
-                </Border>
-              </Grid>
-            </Popup>
-
-            <Border  Background="{TemplateBinding Background}"
-                     BorderBrush="{TemplateBinding BorderBrush}"
-                     BorderThickness="{TemplateBinding BorderThickness}" />
-            <ToggleButton x:Name="PART_DropDownButton"
-                          Content="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          Background="{TemplateBinding Background}"
-                          Focusable="False"
-                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource ComboBoxToggleButton}"
-                          Padding="{TemplateBinding Padding}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
-            </ToggleButton>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver"
-               Value="True">
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-      </Trigger>
-      <Trigger Property="IsKeyboardFocusWithin"
-               Value="True">
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
deleted file mode 100644
index 7311dbfc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,206 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-  <SolidColorBrush x:Key="ButtonNormalBorder"
-                   Color="#FF707070" />
-
-  <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
-
-  <Style x:Key="ComboBoxToggleButton"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="OverridesDefaultStyle"
-            Value="true" />
-    <Setter Property="IsTabStop"
-            Value="false" />
-    <Setter Property="Focusable"
-            Value="false" />
-    <Setter Property="Padding"
-            Value="2" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <chrome:ButtonChrome x:Name="Chrome"
-                               BorderBrush="{TemplateBinding BorderBrush}"
-                               Background="{TemplateBinding Background}"
-                               CornerRadius="0"
-                               RenderEnabled="{TemplateBinding IsEnabled}"
-                               RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
-                               RenderNormal="False"
-                               RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}"
-                               SnapsToDevicePixels="true">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"
-                                  Width="0" />
-              </Grid.ColumnDefinitions>
-
-              <TextBox x:Name="TextBox"
-                       Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                       Foreground="{TemplateBinding Foreground}"
-                       IsReadOnly="True"
-                       Focusable="False"
-                       Cursor="Arrow"
-                       BorderThickness="0"
-                       Background="Transparent"
-                       Margin="{TemplateBinding Padding}"
-                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                       HorizontalScrollBarVisibility="Hidden"
-                       VerticalScrollBarVisibility="Hidden" >
-              </TextBox>
-              <Grid Grid.Column="1"
-                    HorizontalAlignment="Right"
-                    Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                <Path x:Name="Arrow"
-                      Data="{StaticResource DownArrowGeometry}"
-                      Fill="Black"
-                      HorizontalAlignment="Center"
-                      Margin="3,0,3,0"
-                      VerticalAlignment="Center" />
-              </Grid>
-            </Grid>
-          </chrome:ButtonChrome>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked"
-                     Value="true">
-              <Setter Property="RenderPressed"
-                      TargetName="Chrome"
-                      Value="true" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="false">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-            <DataTrigger Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type local:CheckComboBox}}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="False"
-                      TargetName="TextBox" />
-              <Setter Property="Focusable"
-                      Value="True"
-                      TargetName="TextBox" />
-              <Setter Property="Cursor"
-                      Value="{x:Null}"
-                      TargetName="TextBox" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:CheckComboBox}">
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{StaticResource ButtonNormalBorder}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="Padding"
-            Value="2" />
-    <Setter Property="ScrollViewer.CanContentScroll"
-            Value="true" />
-    <Setter Property="Stylus.IsFlicksEnabled"
-            Value="False" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
-          <Grid x:Name="MainGrid"
-                SnapsToDevicePixels="true">
-            <Popup x:Name="PART_Popup"
-                   AllowsTransparency="true"
-                   IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                   StaysOpen="False"
-                   Margin="1"
-                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
-                   Placement="Bottom">
-              <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
-                <Border x:Name="DropDownBorder"
-                        MaxHeight="{Binding MaxDropDownHeight,  RelativeSource={RelativeSource TemplatedParent}}"
-                        BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
-                        BorderThickness="1"
-                        Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-                  <ScrollViewer x:Name="DropDownScrollViewer">
-                    <Grid>
-                      <Canvas HorizontalAlignment="Left"
-                              Height="0"
-                              VerticalAlignment="Top"
-                              Width="0">
-                        <Rectangle x:Name="OpaqueRect"
-                                   Fill="{Binding Background, ElementName=DropDownBorder}"
-                                   Height="{Binding ActualHeight, ElementName=DropDownBorder}"
-                                   Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
-                      </Canvas>
-                      <StackPanel>
-                        <prim:SelectAllSelectorItem x:Name="PART_SelectAllSelectorItem"
-                                                    Content="{TemplateBinding SelectAllContent}"
-                                                    Visibility="{Binding IsSelectAllActive, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
-                        <ItemsPresenter x:Name="PART_ItemsPresenter"
-                                        KeyboardNavigation.DirectionalNavigation="Contained"
-                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                      </StackPanel>
-                    </Grid>
-                  </ScrollViewer>
-                </Border>
-              </Grid>
-            </Popup>
-
-            <Border Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}" />
-            <ToggleButton x:Name="PART_DropDownButton"
-                          Content="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          Background="{TemplateBinding Background}"
-                          Focusable="False"
-                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource ComboBoxToggleButton}"
-                          Padding="{TemplateBinding Padding}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" >
-            </ToggleButton>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
deleted file mode 100644
index 6b97c457..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class CheckListBox : SelectAllSelector
-  {
-    #region Constructors
-
-    static CheckListBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CheckListBox ), new FrameworkPropertyMetadata( typeof( CheckListBox ) ) );
-    }
-
-    public CheckListBox()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Override
-
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 4d03d107..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-  <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-  <Style TargetType="{x:Type local:CheckListBox}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="KeyboardNavigation.TabNavigation"
-            Value="Once" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CheckListBox}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <ScrollViewer Padding="{TemplateBinding Padding}"
-                          VerticalScrollBarVisibility="Auto"
-                          HorizontalScrollBarVisibility="Auto">
-              <StackPanel>
-                <prim:SelectAllSelectorItem x:Name="PART_SelectAllSelectorItem"
-                                            Content="{TemplateBinding SelectAllContent}"
-                                            Visibility="{Binding IsSelectAllActive, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
-                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </StackPanel>
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver"
-               Value="True">
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-      </Trigger>
-      <Trigger Property="IsKeyboardFocusWithin"
-               Value="True">
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
deleted file mode 100644
index bd3d6c91..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
-
-  <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-  <Style TargetType="{x:Type local:CheckListBox}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="#FF707070" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="KeyboardNavigation.TabNavigation"
-            Value="Once" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CheckListBox}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <ScrollViewer Padding="{TemplateBinding Padding}"
-                          VerticalScrollBarVisibility="Auto"
-                          HorizontalScrollBarVisibility="Auto">
-              <StackPanel>
-                <prim:SelectAllSelectorItem x:Name="PART_SelectAllSelectorItem"
-                                            Content="{TemplateBinding SelectAllContent}"
-                                            Visibility="{Binding IsSelectAllActive, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
-                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </StackPanel>
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
deleted file mode 100644
index ad27f8ba..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
+++ /dev/null
@@ -1,875 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-#pragma warning disable 0809
-#pragma warning disable 0618 
-
-  [TemplatePart( Name = PART_WindowRoot, Type = typeof( Grid ) )]  
-  [TemplatePart( Name = PART_Root, Type = typeof( Grid ) )]   
-  [TemplatePart( Name = PART_WindowControl, Type = typeof( WindowControl ) )]
-  public class ChildWindow : WindowControl
-  {
-    private const string PART_WindowRoot = "PART_WindowRoot";  
-    private const string PART_Root = "PART_Root";   
-    private const string PART_WindowControl = "PART_WindowControl";
-    private const int _horizontalOffset = 3;
-    private const int _verticalOffset = 3;
-
-    #region Private Members
-
-    private Grid _root; 
-    private TranslateTransform _moveTransform = new TranslateTransform();  
-    private bool _startupPositionInitialized;  
-    private FrameworkElement _parentContainer;  
-    private Rectangle _modalLayer = new Rectangle();  
-    private Canvas _modalLayerPanel = new Canvas();  
-    private Grid _windowRoot;  
-    private WindowControl _windowControl;
-    private bool _ignorePropertyChanged;
-    private bool _hasChildren;
-    private bool _hasWindowContainer;  
-
-    #endregion //Private Members
-
-    #region Public Properties
-
-    #region DialogResult
-
-    private bool? _dialogResult;
-    /// <summary>
-    /// Gets or sets a value indicating whether the ChildWindow was accepted or canceled.
-    /// </summary>
-    /// <value>
-    /// True if the child window was accepted; false if the child window was
-    /// canceled. The default is null.
-    /// </value>
-    [TypeConverter( typeof( NullableBoolConverter ) )]
-    public bool? DialogResult
-    {
-      get
-      {
-        return _dialogResult;
-      }
-      set
-      {
-        if( _dialogResult != value )
-        {
-          _dialogResult = value;
-          this.Close();
-        }
-      }
-    }
-
-    #endregion //DialogResult
-
-    #region DesignerWindowState
-
-    public static readonly DependencyProperty DesignerWindowStateProperty = DependencyProperty.Register( "DesignerWindowState", typeof( WindowState ), typeof( ChildWindow ), new PropertyMetadata( WindowState.Closed, OnDesignerWindowStatePropertyChanged ) );
-    public WindowState DesignerWindowState
-    {
-      get
-      {
-        return ( WindowState )GetValue( DesignerWindowStateProperty );
-      }
-      set
-      {
-        SetValue( DesignerWindowStateProperty, value );
-      }
-    }
-
-    private static void OnDesignerWindowStatePropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = d as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnDesignerWindowStatePropertyChanged( ( WindowState )e.OldValue, ( WindowState )e.NewValue );
-    }
-
-    protected virtual void OnDesignerWindowStatePropertyChanged( WindowState oldValue, WindowState newValue )
-    {
-      if( DesignerProperties.GetIsInDesignMode( this ) )
-      {
-        Visibility = newValue == Xceed.Wpf.Toolkit.WindowState.Open ? Visibility.Visible : Visibility.Collapsed;
-      }
-    }
-
-    #endregion //DesignerWindowState
-
-    #region FocusedElement
-
-    public static readonly DependencyProperty FocusedElementProperty = DependencyProperty.Register( "FocusedElement", typeof( FrameworkElement ), typeof( ChildWindow ), new UIPropertyMetadata( null ) );
-    public FrameworkElement FocusedElement
-    {
-      get
-      {
-        return ( FrameworkElement )GetValue( FocusedElementProperty );
-      }
-      set
-      {
-        SetValue( FocusedElementProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsModal
-
-    public static readonly DependencyProperty IsModalProperty = DependencyProperty.Register( "IsModal", typeof( bool ), typeof( ChildWindow ), new UIPropertyMetadata( false, new PropertyChangedCallback( OnIsModalPropertyChanged ) ) );
-    public bool IsModal
-    {
-      get
-      {
-        return ( bool )GetValue( IsModalProperty );
-      }
-      set
-      {
-        SetValue( IsModalProperty, value );
-      }
-    }
-
-    private static void OnIsModalPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = d as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnIsModalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    internal event EventHandler<EventArgs> IsModalChanged;
-
-    private void OnIsModalChanged( bool oldValue, bool newValue )
-    {
-      EventHandler<EventArgs> handler = IsModalChanged;
-      if( handler != null )
-      {
-        handler( this, EventArgs.Empty );
-      }
-
-      if( !_hasWindowContainer )
-      {
-        if( newValue )
-        {
-          KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Cycle );
-          ShowModalLayer();
-        }
-        else
-        {
-          KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Continue );
-          HideModalLayer();
-        }
-      }
-    }
-
-    #endregion //IsModal
-
-    #region OverlayBrush (Obsolete)
-
-    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
-    public static readonly DependencyProperty OverlayBrushProperty = DependencyProperty.Register( "OverlayBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( Brushes.Gray, OnOverlayBrushChanged ) );
-    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
-    public Brush OverlayBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( OverlayBrushProperty );
-      }
-      set
-      {
-        SetValue( OverlayBrushProperty, value );
-      }
-    }
-
-    private static void OnOverlayBrushChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = d as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnOverlayBrushChanged( ( Brush )e.OldValue, ( Brush )e.NewValue );
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
-    protected virtual void OnOverlayBrushChanged( Brush oldValue, Brush newValue )
-    {
-      _modalLayer.Fill = newValue;
-    }
-
-    #endregion //OverlayBrush
-
-    #region OverlayOpacity (Obsolete)
-
-    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
-    public static readonly DependencyProperty OverlayOpacityProperty = DependencyProperty.Register( "OverlayOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.5, OnOverlayOpacityChanged ) );
-    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
-    public double OverlayOpacity
-    {
-      get
-      {
-        return ( double )GetValue( OverlayOpacityProperty );
-      }
-      set
-      {
-        SetValue( OverlayOpacityProperty, value );
-      }
-    }
-
-    private static void OnOverlayOpacityChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = d as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnOverlayOpacityChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
-    protected virtual void OnOverlayOpacityChanged( double oldValue, double newValue )
-    {
-      _modalLayer.Opacity = newValue;
-    }
-
-    #endregion //OverlayOpacity  
-
-    #region WindowStartupLocation
-
-    public static readonly DependencyProperty WindowStartupLocationProperty = DependencyProperty.Register( "WindowStartupLocation", typeof( WindowStartupLocation ), typeof( ChildWindow ), new UIPropertyMetadata( WindowStartupLocation.Manual, OnWindowStartupLocationChanged ) );
-    public WindowStartupLocation WindowStartupLocation
-    {
-      get
-      {
-        return ( WindowStartupLocation )GetValue( WindowStartupLocationProperty );
-      }
-      set
-      {
-        SetValue( WindowStartupLocationProperty, value );
-      }
-    }
-
-    private static void OnWindowStartupLocationChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = o as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnWindowStartupLocationChanged( ( WindowStartupLocation )e.OldValue, ( WindowStartupLocation )e.NewValue );
-    }
-
-    protected virtual void OnWindowStartupLocationChanged( WindowStartupLocation oldValue, WindowStartupLocation newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //WindowStartupLocation
-
-    #region WindowState
-
-    public static readonly DependencyProperty WindowStateProperty = DependencyProperty.Register( "WindowState", typeof( WindowState ), typeof( ChildWindow ), new FrameworkPropertyMetadata( WindowState.Closed, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnWindowStatePropertyChanged ) );
-    public WindowState WindowState
-    {
-      get
-      {
-        return ( WindowState )GetValue( WindowStateProperty );
-      }
-      set
-      {
-        SetValue( WindowStateProperty, value );
-      }
-    }
-
-    private static void OnWindowStatePropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = d as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnWindowStatePropertyChanged( ( WindowState )e.OldValue, ( WindowState )e.NewValue );
-    }
-
-    protected virtual void OnWindowStatePropertyChanged( WindowState oldValue, WindowState newValue )
-    {
-      if( !DesignerProperties.GetIsInDesignMode( this ) )
-      {
-        if( !_ignorePropertyChanged )
-          SetWindowState( newValue );
-      }
-      else
-      {
-        Visibility = DesignerWindowState == Xceed.Wpf.Toolkit.WindowState.Open ? Visibility.Visible : System.Windows.Visibility.Collapsed;
-      }
-    }
-
-    #endregion //WindowState
-
-    #endregion //Public Properties
-
-    #region Constructors
-
-    static ChildWindow()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ChildWindow ), new FrameworkPropertyMetadata( typeof( ChildWindow ) ) );
-    }
-
-    public ChildWindow()
-    {
-      DesignerWindowState = Xceed.Wpf.Toolkit.WindowState.Open;
-
-      _modalLayer.Fill = OverlayBrush;
-      _modalLayer.Opacity = OverlayOpacity;
-
-      this.IsVisibleChanged += this.ChildWindow_IsVisibleChanged;
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    internal override bool AllowPublicIsActiveChange
-    {
-      get { return false; }
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _windowControl != null )
-      {
-        _windowControl.HeaderDragDelta -= ( o, e ) => this.OnHeaderDragDelta( e );
-        _windowControl.HeaderIconDoubleClicked -= ( o, e ) => this.OnHeaderIconDoubleClick( e );
-        _windowControl.CloseButtonClicked -= ( o, e ) => this.OnCloseButtonClicked( e );
-      }
-      _windowControl = this.GetTemplateChild( PART_WindowControl ) as WindowControl;
-      if( _windowControl != null )
-      {
-        _windowControl.HeaderDragDelta += ( o, e ) => this.OnHeaderDragDelta( e );
-        _windowControl.HeaderIconDoubleClicked += ( o, e ) => this.OnHeaderIconDoubleClick( e );
-        _windowControl.CloseButtonClicked += ( o, e ) => this.OnCloseButtonClicked( e );
-      }
-
-      this.UpdateBlockMouseInputsPanel();
-
-      _windowRoot = this.GetTemplateChild( PART_WindowRoot ) as Grid;
-      if( _windowRoot != null )
-      {
-        _windowRoot.RenderTransform = _moveTransform;
-      }
-      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
-
-      if( !_hasWindowContainer )
-      {
-        _parentContainer = VisualTreeHelper.GetParent( this ) as FrameworkElement;
-        if( _parentContainer != null )
-        {
-          _parentContainer.LayoutUpdated += ParentContainer_LayoutUpdated;
-          _parentContainer.SizeChanged += ParentContainer_SizeChanged;
-
-          //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
-          //we need to handle the loaded event and reposition the window.
-          if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
-          {
-            _parentContainer.Loaded += ( o, e ) =>
-            {
-              ExecuteOpen();
-            };
-          }
-        }
-
-        this.Unloaded += new RoutedEventHandler( ChildWindow_Unloaded );
-
-        //initialize our modal background width/height
-        _modalLayer.Height = _parentContainer.ActualHeight;
-        _modalLayer.Width = _parentContainer.ActualWidth;
-
-        _root = this.GetTemplateChild( PART_Root ) as Grid;
-
-#if VS2008
-      FocusVisualStyle = null;
-#else
-        Style focusStyle = ( _root != null ) ? _root.Resources[ "FocusVisualStyle" ] as Style : null;
-        if( focusStyle != null )
-        {
-          Setter focusStyleDataContext = new Setter( Control.DataContextProperty, this );
-          focusStyle.Setters.Add( focusStyleDataContext );
-          FocusVisualStyle = focusStyle;
-        }
-#endif
-        if( _root != null )
-        {
-          _root.Children.Add( _modalLayerPanel );
-        }
-      }
-    }
-
-    protected override void OnGotFocus( RoutedEventArgs e )
-    {
-      base.OnGotFocus( e );
-
-      Action action = () =>
-      {
-        if( FocusedElement != null )
-        {
-          _hasChildren = true;
-          FocusedElement.Focus();
-        }
-        else
-        {
-          //Focus first Focusable Child element of ChildWindow
-          var focusableChild = TreeHelper.FindChild<FrameworkElement>( this.Content as DependencyObject, x => x.Focusable );
-          if( focusableChild != null )
-          {
-            _hasChildren = true;
-            focusableChild.Focus();
-          }
-          else
-          {
-            _hasChildren = false;
-          }
-        }
-      };
-
-      Dispatcher.BeginInvoke( DispatcherPriority.ApplicationIdle, action );
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      base.OnPreviewKeyDown( e );
-
-      if( this.IsModal )
-      {
-        // Prevent MenuItem shortcuts while ChildWindow is modal.
-        if( Keyboard.IsKeyDown( Key.LeftAlt ) || Keyboard.IsKeyDown( Key.RightAlt ) )
-        {
-          e.Handled = true;
-        }
-        // Prevent Tab when no children
-        else if( (e.Key == Key.Tab) && !_hasChildren )
-        {
-          e.Handled = true;
-        }
-      }
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      base.OnKeyDown( e );
-
-      if( WindowState == WindowState.Open )
-      {
-        switch( e.Key )
-        {
-          case Key.Left:
-            this.Left -= _horizontalOffset;
-            e.Handled = true;
-            break;
-
-          case Key.Right:
-            this.Left += _horizontalOffset;
-            e.Handled = true;
-            break;
-
-          case Key.Down:
-            this.Top += _verticalOffset;
-            e.Handled = true;
-            break;
-
-          case Key.Up:
-            this.Top -= _verticalOffset;
-            e.Handled = true;
-            break;
-        }
-      }
-    }
-
-    protected override void OnLeftPropertyChanged( double oldValue, double newValue )
-    {
-      base.OnLeftPropertyChanged( oldValue, newValue );
-
-      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
-      if( !_hasWindowContainer )
-      {
-          Left = GetRestrictedLeft();
-        ProcessMove( newValue - oldValue, 0 );
-      }
-    }
-
-    protected override void OnTopPropertyChanged( double oldValue, double newValue )
-    {
-      base.OnTopPropertyChanged( oldValue, newValue );
-
-      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
-      if( !_hasWindowContainer )
-      {
-          Top = GetRestrictedTop();
-        ProcessMove( 0, newValue - oldValue );
-      }
-    }
-
-    internal override void UpdateBlockMouseInputsPanel()
-    {
-      if( _windowControl != null )
-      {
-        _windowControl.IsBlockMouseInputsPanelActive = this.IsBlockMouseInputsPanelActive;
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    protected virtual void OnHeaderDragDelta( DragDeltaEventArgs e )
-    {
-      if( !this.IsCurrentWindow( e.OriginalSource ) )
-        return;
-
-      e.Handled = true;
-
-      DragDeltaEventArgs args = new DragDeltaEventArgs( e.HorizontalChange, e.VerticalChange );
-      args.RoutedEvent = HeaderDragDeltaEvent;
-      args.Source = this;
-      this.RaiseEvent( args );
-
-      if( !args.Handled )
-      {
-        if( object.Equals( e.OriginalSource, _windowControl ) )
-        {
-          double left = 0.0;
-
-          if( this.FlowDirection == FlowDirection.RightToLeft )
-            left = this.Left - e.HorizontalChange;
-          else
-            left = this.Left + e.HorizontalChange;
-
-          this.Left = left;
-          this.Top += e.VerticalChange;
-        }
-      }
-    }
-
-    protected virtual void OnHeaderIconDoubleClick( MouseButtonEventArgs e )
-    {
-      if( !this.IsCurrentWindow( e.OriginalSource ) )
-        return;
-
-      e.Handled = true;
-
-      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
-      args.RoutedEvent = HeaderIconDoubleClickedEvent;
-      args.Source = this;
-      this.RaiseEvent( args );
-
-      if( !args.Handled )
-      {
-        this.Close();
-      }
-    }
-
-    protected virtual void OnCloseButtonClicked( RoutedEventArgs e )
-    {
-      if( !this.IsCurrentWindow( e.OriginalSource ) )
-        return;
-
-      e.Handled = true;
-
-      RoutedEventArgs args = new RoutedEventArgs( CloseButtonClickedEvent, this );
-      this.RaiseEvent( args );
-
-      if( !args.Handled )
-      {
-        this.Close();
-      }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-    [Obsolete( "This method is obsolete and should no longer be used." )]
-    private void ParentContainer_LayoutUpdated( object sender, EventArgs e )
-    {
-      if( DesignerProperties.GetIsInDesignMode( this ) )
-        return;
-
-      //we only want to set the start position if this is the first time the control has bee initialized
-      if( !_startupPositionInitialized )
-      {
-        ExecuteOpen();
-        _startupPositionInitialized = true;
-      }
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used." )]
-    private void ChildWindow_Unloaded( object sender, RoutedEventArgs e )
-    {
-      if( _parentContainer != null )
-      {
-        _parentContainer.LayoutUpdated -= ParentContainer_LayoutUpdated;
-        _parentContainer.SizeChanged -= ParentContainer_SizeChanged;        
-
-        //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
-        //we need to handle the loaded event and reposition the window.
-        if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
-        {
-          _parentContainer.Loaded -= ( o, ev ) =>
-          {
-            ExecuteOpen();
-          };
-        }
-      }
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used." )]
-    void ParentContainer_SizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      //resize our modal layer
-      _modalLayer.Height = e.NewSize.Height;
-      _modalLayer.Width = e.NewSize.Width;
-
-      //reposition our window
-      Left = GetRestrictedLeft();
-      Top = GetRestrictedTop();
-    }
-
-    private void ChildWindow_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      if( (bool)e.NewValue && this.IsModal )
-      {
-        this.Focus();
-      }
-    }
-
-
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    #region Private
-
-
-
-    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.GetRestrictedLeft() instead." )]
-    private double GetRestrictedLeft()
-    {
-      if( Left < 0 )
-        return 0;
-
-      if( ( _parentContainer != null ) && (_windowRoot != null) )
-      {
-        if( Left + _windowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 )
-        {
-          double left = _parentContainer.ActualWidth - _windowRoot.ActualWidth;
-          return left < 0 ? 0 : left;
-        }
-      }
-
-      return Left;
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.GetRestrictedTop() instead." )]
-    private double GetRestrictedTop()
-    {
-      if( Top < 0 )
-        return 0;
-
-      if( ( _parentContainer != null ) && ( _windowRoot != null ) )
-      {
-        if( Top + _windowRoot.ActualHeight > _parentContainer.ActualHeight && _parentContainer.ActualHeight != 0 )
-        {
-          double top = _parentContainer.ActualHeight - _windowRoot.ActualHeight;
-          return top < 0 ? 0 : top;
-        }
-      }
-
-      return Top;
-    }
-
-    private void SetWindowState( WindowState state )
-    {
-      switch( state )
-      {
-        case WindowState.Closed:
-          {
-            ExecuteClose();
-            break;
-          }
-        case WindowState.Open:
-          {
-            ExecuteOpen();
-            break;
-          }
-      }
-    }
-
-    private void ExecuteClose()
-    {
-      CancelEventArgs e = new CancelEventArgs();
-      OnClosing( e );
-
-      if( !e.Cancel )
-      {
-        if( !_dialogResult.HasValue )
-          _dialogResult = false;
-
-        OnClosed( EventArgs.Empty );
-      }
-      else
-      {
-        CancelClose();
-      }
-    }
-
-    private void CancelClose()
-    {
-      _dialogResult = null; //when the close is cancelled, DialogResult should be null
-
-      _ignorePropertyChanged = true;
-      WindowState = WindowState.Open; //now reset the window state to open because the close was cancelled
-      _ignorePropertyChanged = false;
-    }
-
-    private void ExecuteOpen()
-    {
-      _dialogResult = null; //reset the dialogResult to null each time the window is opened
-
-      if( !_hasWindowContainer )
-        if( WindowStartupLocation == Xceed.Wpf.Toolkit.WindowStartupLocation.Center )
-          CenterChildWindow(); 
-
-      if( !_hasWindowContainer )
-        BringToFront();
-    }
-
-    private bool IsCurrentWindow( object windowtoTest )
-    {
-      return object.Equals( _windowControl, windowtoTest );
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.BringToFront() instead." )]
-    private void BringToFront()
-    {
-      int index = 0;
-
-      if( _parentContainer != null )
-        index = ( int )_parentContainer.GetValue( Canvas.ZIndexProperty );
-
-      SetValue( Canvas.ZIndexProperty, ++index );
-
-      if( IsModal )
-        Canvas.SetZIndex( _modalLayerPanel, index - 2 );
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.CenterChild() instead." )]
-    private void CenterChildWindow()
-    {
-      if( ( _parentContainer != null ) && ( _windowRoot != null ) )
-      {
-        _windowRoot.UpdateLayout();
-
-        Left = ( _parentContainer.ActualWidth - _windowRoot.ActualWidth ) / 2.0;
-        Top = ( _parentContainer.ActualHeight - _windowRoot.ActualHeight ) / 2.0;
-      }
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used." )]
-    private void ShowModalLayer()
-    {
-      if( !DesignerProperties.GetIsInDesignMode( this ) )
-      {
-        if( !_modalLayerPanel.Children.Contains( _modalLayer ) )
-          _modalLayerPanel.Children.Add( _modalLayer );
-
-        _modalLayer.Visibility = System.Windows.Visibility.Visible;
-      }
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used." )]
-    private void HideModalLayer()
-    {
-      _modalLayer.Visibility = System.Windows.Visibility.Collapsed;
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used. Use the ChildWindow in a WindowContainer instead." )]
-    private void ProcessMove( double x, double y )
-    {
-      _moveTransform.X += x;
-      _moveTransform.Y += y;
-
-      InvalidateArrange();
-    }
-
-    #endregion //Private
-
-    #region Public
-
-    public void Show()
-    {
-      WindowState = WindowState.Open;
-    }
-
-    public void Close()
-    {
-      WindowState = WindowState.Closed;
-    }
-
-    #endregion //Public
-
-    #endregion //Methods
-
-    #region Events
-
-    /// <summary>
-    /// Occurs when the ChildWindow is closed.
-    /// </summary>
-    public event EventHandler Closed;
-    protected virtual void OnClosed( EventArgs e )
-    {
-      if( Closed != null )
-        Closed( this, e );
-    }
-
-    /// <summary>
-    /// Occurs when the ChildWindow is closing.
-    /// </summary>
-    public event EventHandler<CancelEventArgs> Closing;
-    protected virtual void OnClosing( CancelEventArgs e )
-    {
-      if( Closing != null )
-        Closing( this, e );
-    }
-
-    #endregion //Events
-
-  }
-
-#pragma warning restore 0809
-#pragma warning restore 0618
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
deleted file mode 100644
index 690c9232..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum WindowStartupLocation
-  {
-    Center,
-    Manual
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
deleted file mode 100644
index 07209708..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum WindowState
-  {
-    Closed,
-    Open
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 2a5bd5ef..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-        <ResourceDictionary Source="../../Primitives/Themes/Aero2/WindowControl.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <SolidColorBrush x:Key="BorderBrush" Color="Orange" />
-
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-
-    <!-- =============================================================================== -->
-    <!-- ChildWindow                                                                      -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:ChildWindow}" BasedOn="{StaticResource {x:Type prim:WindowControl}}">
-        <Setter Property="MinWidth" Value="120" />
-        <Setter Property="MinHeight" Value="45" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ChildWindow}">
-                    <Grid x:Name="PART_Root">
-                        <!-- Used For modal layer Deprecated-->
-                        <Grid.Resources>
-                            <!-- Used For KeyboardFocus Deprecated-->
-                            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-                            <Style x:Key="FocusVisualStyle" TargetType="Control">
-                                <Setter Property="BorderBrush" Value="Black" />
-                                <Setter Property="Background" Value="Transparent" />
-                                <Setter Property="Margin" Value="-1" />
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate>
-                                            <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
-                                                <Rectangle.RenderTransform>
-                                                    <TranslateTransform x:Name="_translateTransform" X="{Binding Left}" Y="{Binding Top}" />
-                                                </Rectangle.RenderTransform>
-                                            </Rectangle>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </Grid.Resources>
-
-                        <!-- Used for drag -->
-                        <Grid x:Name="PART_WindowRoot"
-                          HorizontalAlignment="Left" 
-                          VerticalAlignment="Top" 
-                          MinWidth="{TemplateBinding MinWidth}"
-                          MinHeight="{TemplateBinding MinHeight}" 
-                          Width="{TemplateBinding Width}" 
-                          Height="{TemplateBinding Height}">
-
-                            <prim:WindowControl x:Name="PART_WindowControl" 
-                                            Caption="{TemplateBinding Caption}"
-                                            CaptionFontSize="{TemplateBinding CaptionFontSize}"
-                                            CaptionForeground="{TemplateBinding CaptionForeground}" 
-                                            CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}" 
-                                            CaptionIcon="{TemplateBinding CaptionIcon}"
-                                            Background="{TemplateBinding Background}"
-                                            BorderBrush="{TemplateBinding BorderBrush}" 
-                                            BorderThickness="{TemplateBinding BorderThickness}" 
-                                            IsActive="{TemplateBinding IsActive}"
-                                            WindowBackground="{TemplateBinding WindowBackground}" 
-                                            WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}" 
-                                            WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
-                                            WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
-                                            CloseButtonVisibility="{TemplateBinding CloseButtonVisibility}"
-                                            CloseButtonStyle="{TemplateBinding CloseButtonStyle}" 
-                                            WindowOpacity="{TemplateBinding WindowOpacity}" 
-                                            Content="{TemplateBinding Content}"
-                                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                                            WindowStyle="{TemplateBinding WindowStyle}"
-                                            Width="{TemplateBinding Width}"
-                                            Height="{TemplateBinding Height}">
-                            </prim:WindowControl>
-                        </Grid>
-                    </Grid>
-
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Closed">
-                            <Setter Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
deleted file mode 100644
index 7256260d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
+++ /dev/null
@@ -1,105 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
-
-    <ResourceDictionary.MergedDictionaries>
-       <ResourceDictionary Source="../../Themes/Generic/Common.xaml" />
-       <ResourceDictionary Source="../../Primitives/Themes/Generic/WindowControl.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-
-   <!-- =============================================================================== -->
-   <!-- ChildWindow                                                                      -->
-   <!-- =============================================================================== -->
-
-   <Style TargetType="{x:Type local:ChildWindow}" BasedOn="{StaticResource {x:Type prim:WindowControl}}">
-      <Setter Property="MinWidth" Value="140" />
-      <Setter Property="MinHeight" Value="40" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:ChildWindow}">
-                <Grid x:Name="PART_Root"> <!-- Used For modal layer Deprecated-->
-                    <Grid.Resources>  <!-- Used For KeyboardFocus Deprecated-->
-                     <Style x:Key="FocusVisualStyle" TargetType="Control">
-                        <Setter Property="BorderBrush" Value="Black" />
-                        <Setter Property="Background" Value="Transparent" />
-                        <Setter Property="Margin" Value="-1" />
-                        <Setter Property="Template">
-                           <Setter.Value>
-                              <ControlTemplate>
-                                 <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
-                                    <Rectangle.RenderTransform>
-                                       <TranslateTransform x:Name="_translateTransform" X="{Binding Left}" Y="{Binding Top}" />
-                                    </Rectangle.RenderTransform>
-                                 </Rectangle>
-                              </ControlTemplate>
-                           </Setter.Value>
-                        </Setter>
-                     </Style>
-                  </Grid.Resources> 
-
-                    <!-- Used for drag -->
-                    <Grid x:Name="PART_WindowRoot"
-                          HorizontalAlignment="Left" 
-                          VerticalAlignment="Top" 
-                          MinWidth="{TemplateBinding MinWidth}"
-                          MinHeight="{TemplateBinding MinHeight}" 
-                          Width="{TemplateBinding Width}" 
-                          Height="{TemplateBinding Height}">
-
-                        <prim:WindowControl x:Name="PART_WindowControl" 
-                                            Caption="{TemplateBinding Caption}"
-                                            CaptionFontSize="{TemplateBinding CaptionFontSize}"
-                                            CaptionForeground="{TemplateBinding CaptionForeground}" 
-                                            CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}" 
-                                            CaptionIcon="{TemplateBinding CaptionIcon}"
-                                            Background="{TemplateBinding Background}"
-                                            BorderBrush="{TemplateBinding BorderBrush}" 
-                                            BorderThickness="{TemplateBinding BorderThickness}" 
-                                            IsActive="{TemplateBinding IsActive}"
-                                            WindowBackground="{TemplateBinding WindowBackground}" 
-                                            WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}" 
-                                            WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
-                                            WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
-                                            CloseButtonVisibility="{TemplateBinding CloseButtonVisibility}"
-                                            CloseButtonStyle="{TemplateBinding CloseButtonStyle}" 
-                                            WindowOpacity="{TemplateBinding WindowOpacity}" 
-                                            Content="{TemplateBinding Content}"
-                                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                                            WindowStyle="{TemplateBinding WindowStyle}"
-                                            Width="{TemplateBinding Width}"
-                                            Height="{TemplateBinding Height}">
-                        </prim:WindowControl>
-                    </Grid>
-                </Grid>
-
-               <ControlTemplate.Triggers>
-                  <Trigger Property="WindowState" Value="Closed">
-                     <Setter Property="Visibility" Value="Collapsed" />
-                  </Trigger>
-                </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
deleted file mode 100644
index 89c66d09..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.Chromes
-{
-  public class ButtonChrome : ContentControl
-  {
-    #region CornerRadius
-
-    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register( "CornerRadius", typeof( CornerRadius ), typeof( ButtonChrome ), new UIPropertyMetadata( default( CornerRadius ), new PropertyChangedCallback( OnCornerRadiusChanged ) ) );
-    public CornerRadius CornerRadius
-    {
-      get
-      {
-        return ( CornerRadius )GetValue( CornerRadiusProperty );
-      }
-      set
-      {
-        SetValue( CornerRadiusProperty, value );
-      }
-    }
-
-    private static void OnCornerRadiusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnCornerRadiusChanged( ( CornerRadius )e.OldValue, ( CornerRadius )e.NewValue );
-    }
-
-    protected virtual void OnCornerRadiusChanged( CornerRadius oldValue, CornerRadius newValue )
-    {
-      //we always want the InnerBorderRadius to be one less than the CornerRadius
-      CornerRadius newInnerCornerRadius = new CornerRadius( Math.Max( 0, newValue.TopLeft - 1 ),
-                                                           Math.Max( 0, newValue.TopRight - 1 ),
-                                                           Math.Max( 0, newValue.BottomRight - 1 ),
-                                                           Math.Max( 0, newValue.BottomLeft - 1 ) );
-
-      InnerCornerRadius = newInnerCornerRadius;
-    }
-
-    #endregion //CornerRadius
-
-    #region InnerCornerRadius
-
-    public static readonly DependencyProperty InnerCornerRadiusProperty = DependencyProperty.Register( "InnerCornerRadius", typeof( CornerRadius ), typeof( ButtonChrome ), new UIPropertyMetadata( default( CornerRadius ), new PropertyChangedCallback( OnInnerCornerRadiusChanged ) ) );
-    public CornerRadius InnerCornerRadius
-    {
-      get
-      {
-        return ( CornerRadius )GetValue( InnerCornerRadiusProperty );
-      }
-      set
-      {
-        SetValue( InnerCornerRadiusProperty, value );
-      }
-    }
-
-    private static void OnInnerCornerRadiusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnInnerCornerRadiusChanged( ( CornerRadius )e.OldValue, ( CornerRadius )e.NewValue );
-    }
-
-    protected virtual void OnInnerCornerRadiusChanged( CornerRadius oldValue, CornerRadius newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //InnerCornerRadius
-
-    #region RenderChecked
-
-    public static readonly DependencyProperty RenderCheckedProperty = DependencyProperty.Register( "RenderChecked", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderCheckedChanged ) );
-    public bool RenderChecked
-    {
-      get
-      {
-        return ( bool )GetValue( RenderCheckedProperty );
-      }
-      set
-      {
-        SetValue( RenderCheckedProperty, value );
-      }
-    }
-
-    private static void OnRenderCheckedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderCheckedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderCheckedChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderChecked
-
-    #region RenderEnabled
-
-    public static readonly DependencyProperty RenderEnabledProperty = DependencyProperty.Register( "RenderEnabled", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( true, OnRenderEnabledChanged ) );
-    public bool RenderEnabled
-    {
-      get
-      {
-        return ( bool )GetValue( RenderEnabledProperty );
-      }
-      set
-      {
-        SetValue( RenderEnabledProperty, value );
-      }
-    }
-
-    private static void OnRenderEnabledChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderEnabledChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderEnabledChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderEnabled
-
-    #region RenderFocused
-
-    public static readonly DependencyProperty RenderFocusedProperty = DependencyProperty.Register( "RenderFocused", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderFocusedChanged ) );
-    public bool RenderFocused
-    {
-      get
-      {
-        return ( bool )GetValue( RenderFocusedProperty );
-      }
-      set
-      {
-        SetValue( RenderFocusedProperty, value );
-      }
-    }
-
-    private static void OnRenderFocusedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderFocusedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderFocusedChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderFocused
-
-    #region RenderMouseOver
-
-    public static readonly DependencyProperty RenderMouseOverProperty = DependencyProperty.Register( "RenderMouseOver", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderMouseOverChanged ) );
-    public bool RenderMouseOver
-    {
-      get
-      {
-        return ( bool )GetValue( RenderMouseOverProperty );
-      }
-      set
-      {
-        SetValue( RenderMouseOverProperty, value );
-      }
-    }
-
-    private static void OnRenderMouseOverChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderMouseOverChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderMouseOverChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderMouseOver
-
-    #region RenderNormal
-
-    public static readonly DependencyProperty RenderNormalProperty = DependencyProperty.Register( "RenderNormal", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( true, OnRenderNormalChanged ) );
-    public bool RenderNormal
-    {
-      get
-      {
-        return ( bool )GetValue( RenderNormalProperty );
-      }
-      set
-      {
-        SetValue( RenderNormalProperty, value );
-      }
-    }
-
-    private static void OnRenderNormalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderNormalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderNormalChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderNormal
-
-    #region RenderPressed
-
-    public static readonly DependencyProperty RenderPressedProperty = DependencyProperty.Register( "RenderPressed", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderPressedChanged ) );
-    public bool RenderPressed
-    {
-      get
-      {
-        return ( bool )GetValue( RenderPressedProperty );
-      }
-      set
-      {
-        SetValue( RenderPressedProperty, value );
-      }
-    }
-
-    private static void OnRenderPressedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderPressedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderPressedChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderPressed
-
-    #region Contsructors
-
-    static ButtonChrome()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ButtonChrome ), new FrameworkPropertyMetadata( typeof( ButtonChrome ) ) );
-    }
-
-    #endregion //Contsructors
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index d1f499f6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-
-  <!-- =============================================================================== -->
-  <!-- ButtonChrome                                                                    -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type chrome:ButtonChrome}">
-    <Setter Property="CornerRadius"
-            Value="0" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type chrome:ButtonChrome}">
-          <Grid>
-
-            <Border x:Name="OuterBorder"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    Background="{TemplateBinding Background}" />
-
-            <ContentPresenter Margin="{TemplateBinding Padding}"
-                              IsEnabled="{TemplateBinding IsEnabled}"
-                              Content="{TemplateBinding Content}"
-                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-
-          </Grid>
-          <ControlTemplate.Triggers>
-
-            <!-- If button is disabled, not checked, and is rendered normal -->
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="RenderEnabled"
-                           Value="False" />
-                <Condition Property="RenderChecked"
-                           Value="False" />
-              </MultiTrigger.Conditions>
-              <Setter TargetName="OuterBorder"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
-              <Setter TargetName="OuterBorder"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-            </MultiTrigger>
-
-            <!-- if button is enabled and pressed -->
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="RenderEnabled"
-                           Value="True" />
-                <Condition Property="RenderPressed"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter TargetName="OuterBorder"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-              <Setter TargetName="OuterBorder"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-            </MultiTrigger>
-
-            <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="RenderEnabled"
-                           Value="True" />
-                <Condition Property="RenderChecked"
-                           Value="False" />
-                <Condition Property="RenderMouseOver"
-                           Value="True" />
-                <Condition Property="RenderPressed"
-                           Value="False" />
-              </MultiTrigger.Conditions>
-              <Setter TargetName="OuterBorder"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-              <Setter TargetName="OuterBorder"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-            </MultiTrigger>
-
-            <!-- if button is enabled, checked, the mouse is not over, and it is not pressed -->
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="RenderEnabled"
-                           Value="True" />
-                <Condition Property="RenderChecked"
-                           Value="True" />
-                <Condition Property="RenderMouseOver"
-                           Value="False" />
-                <Condition Property="RenderPressed"
-                           Value="False" />
-              </MultiTrigger.Conditions>
-              <Setter TargetName="OuterBorder"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-              <Setter TargetName="OuterBorder"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-            </MultiTrigger>
-
-            <!-- if button is focused, is enabled, not pressed, and the mouse is not over -->
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="RenderFocused"
-                           Value="True" />
-                <Condition Property="RenderEnabled"
-                           Value="True" />
-                <Condition Property="RenderPressed"
-                           Value="False" />
-                <Condition Property="RenderMouseOver"
-                           Value="False" />
-              </MultiTrigger.Conditions>
-              <Setter TargetName="OuterBorder"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}}" />
-              <Setter TargetName="OuterBorder"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}}" />
-            </MultiTrigger>
-
-            <!-- if not rendered normally -->
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="RenderNormal"
-                           Value="False" />
-                <Condition Property="RenderChecked"
-                           Value="False" />
-              </MultiTrigger.Conditions>
-              <Setter TargetName="OuterBorder"
-                      Property="BorderBrush"
-                      Value="Transparent" />
-              <Setter TargetName="OuterBorder"
-                      Property="Background"
-                      Value="Transparent" />
-            </MultiTrigger>
-
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
deleted file mode 100644
index 2ee81a1a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-   <!-- =============================================================================== -->
-   <!-- ButtonChrome                                                                    -->
-   <!-- =============================================================================== -->
-
-   <Style TargetType="{x:Type chrome:ButtonChrome}">
-      <Setter Property="IsTabStop" Value="False" />
-      <Setter Property="SnapsToDevicePixels" Value="True" />
-      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type chrome:ButtonChrome}">
-               <Grid>
-
-                  <Border x:Name="OuterBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                     <Border x:Name="InnerBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}}" />
-                  </Border>
-
-                  <Border x:Name="MouseOverVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}">
-                     <Border x:Name="MouseOverInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}}" />
-                  </Border>
-                  <Border x:Name="PressedVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}">
-                     <Border x:Name="PressedInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
-                  </Border>
-
-                  <Border x:Name="FocusVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}}">
-                     <Border x:Name="FocusInnerVisual" BorderThickness="1" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}}" />
-                  </Border>
-
-                  <ContentPresenter Margin="{TemplateBinding Padding}"
-										      IsEnabled="{TemplateBinding IsEnabled}"
-										      Content="{TemplateBinding Content}"
-										      ContentStringFormat="{TemplateBinding ContentStringFormat}"
-										      ContentTemplate="{TemplateBinding ContentTemplate}"
-										      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-
-               </Grid>
-               <ControlTemplate.Triggers>
-
-                  <!-- If button is disabled, not checked, and is rendered normal -->
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="RenderEnabled" Value="False" />
-                        <Condition Property="RenderChecked" Value="False" />
-                     </MultiTrigger.Conditions>
-                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
-                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}}" />
-                     <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-                  </MultiTrigger>
-
-                  <!-- if button is enabled and pressed -->
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="RenderEnabled" Value="True" />
-                        <Condition Property="RenderPressed" Value="True" />
-                     </MultiTrigger.Conditions>
-                     <MultiTrigger.EnterActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.050" Value="1" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.EnterActions>
-                     <MultiTrigger.ExitActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Collapsed</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.ExitActions>
-                  </MultiTrigger>
-
-                  <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="RenderEnabled" Value="True" />
-                        <Condition Property="RenderChecked" Value="False" />
-                        <Condition Property="RenderMouseOver" Value="True" />
-                        <Condition Property="RenderPressed" Value="False" />
-                     </MultiTrigger.Conditions>
-                     <MultiTrigger.EnterActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="1" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.EnterActions>
-                     <MultiTrigger.ExitActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.150">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Collapsed</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.150" Value="0" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.ExitActions>
-                  </MultiTrigger>
-
-                  <!-- if button is enabled, checked, he mouse is not over, and it is not pressed -->
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="RenderEnabled" Value="True" />
-                        <Condition Property="RenderChecked" Value="True" />
-                        <Condition Property="RenderMouseOver" Value="False" />
-                        <Condition Property="RenderPressed" Value="False" />
-                     </MultiTrigger.Conditions>
-                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
-                     <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-                  </MultiTrigger>
-
-                  <!-- if button is focused, is enabled, not pressed, and the mouse is not over -->
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="RenderFocused" Value="True" />
-                        <Condition Property="RenderEnabled" Value="True" />
-                        <Condition Property="RenderPressed" Value="False" />
-                        <Condition Property="RenderMouseOver" Value="False" />
-                     </MultiTrigger.Conditions>
-                     <MultiTrigger.EnterActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.25" Value="1" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.EnterActions>
-                     <MultiTrigger.ExitActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Collapsed</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.ExitActions>
-                  </MultiTrigger>
-
-                  <!-- if not rendered normally -->
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="RenderNormal" Value="False" />
-                        <Condition Property="RenderChecked" Value="False" />
-                     </MultiTrigger.Conditions>
-                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="Transparent" />
-                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{x:Null}" />
-                     <Setter TargetName="OuterBorder" Property="Background" Value="Transparent" />
-                  </MultiTrigger>
-
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Delete16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Delete16.png
deleted file mode 100644
index dee2496a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Delete16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Duplicate.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Duplicate.png
deleted file mode 100644
index 51b048bc..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Duplicate.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
deleted file mode 100644
index d3c774c2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
+++ /dev/null
@@ -1,705 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using System.Windows.Threading;
-using System.Reflection;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_NewItemTypesComboBox, Type = typeof( ComboBox ) )]
-  [TemplatePart( Name = PART_PropertyGrid, Type = typeof( PropertyGrid.PropertyGrid ) )]
-  [TemplatePart( Name = PART_ListBox, Type = typeof( ListBox ) )]
-  public class CollectionControl : Control
-  {
-    private const string PART_NewItemTypesComboBox = "PART_NewItemTypesComboBox";
-    private const string PART_PropertyGrid = "PART_PropertyGrid";
-    private const string PART_ListBox = "PART_ListBox";
-
-    #region Private Members
-
-    private ComboBox _newItemTypesComboBox;
-    private PropertyGrid.PropertyGrid _propertyGrid;
-    private ListBox _listBox;
-
-    #endregion
-
-    #region Properties
-
-    #region IsReadOnly Property
-
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControl ), new UIPropertyMetadata( false ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-
-    #endregion  //Items
-
-    #region Items Property
-
-    public static readonly DependencyProperty ItemsProperty = DependencyProperty.Register( "Items", typeof( ObservableCollection<object> ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public ObservableCollection<object> Items
-    {
-      get
-      {
-        return ( ObservableCollection<object> )GetValue( ItemsProperty );
-      }
-      set
-      {
-        SetValue( ItemsProperty, value );
-      }
-    }
-
-    #endregion  //Items
-
-    #region ItemsSource Property
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IEnumerable ), typeof( CollectionControl ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return (IEnumerable)GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    private static void OnItemsSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      var CollectionControl = ( CollectionControl )d;
-      if( CollectionControl != null )
-        CollectionControl.OnItemSourceChanged( (IEnumerable)e.OldValue, (IEnumerable)e.NewValue );
-    }
-
-    public void OnItemSourceChanged( IEnumerable oldValue, IEnumerable newValue )
-    {
-      if( newValue != null )
-      {
-        var dict = newValue as IDictionary;
-        if( dict != null )
-        {
-          // A Dictionary contains KeyValuePair that can't be edited.
-          // We need to Add EditableKeyValuePairs from DictionaryEntries.
-          foreach( DictionaryEntry item in dict )
-          {
-            var keyType = (item.Key != null) 
-                          ? item.Key.GetType()
-                          : (dict.GetType().GetGenericArguments().Count() > 0) ? dict.GetType().GetGenericArguments()[0] : typeof( object );
-            var valueType = (item.Value != null)
-                          ? item.Value.GetType()
-                          : (dict.GetType().GetGenericArguments().Count() > 1) ? dict.GetType().GetGenericArguments()[ 1 ] : typeof( object );
-            var editableKeyValuePair = ListUtilities.CreateEditableKeyValuePair( item.Key
-                                                                                , keyType
-                                                                                , item.Value
-                                                                                , valueType );
-            this.Items.Add( editableKeyValuePair );
-          }
-        }
-        else
-        {
-          foreach( var item in newValue )
-          {
-            if( item != null )
-            {
-              Items.Add( item );
-            }
-          }
-        }
-      }
-    }
-
-    #endregion  //ItemsSource
-
-    #region ItemsSourceType Property
-
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public Type ItemsSourceType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    #endregion //ItemsSourceType
-
-    #region NewItemType Property
-
-    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public IList<Type> NewItemTypes
-    {
-      get
-      {
-        return ( IList<Type> )GetValue( NewItemTypesProperty );
-      }
-      set
-      {
-        SetValue( NewItemTypesProperty, value );
-      }
-    }
-
-    #endregion  //NewItemType
-
-    #region PropertiesLabel Property
-
-    public static readonly DependencyProperty PropertiesLabelProperty = DependencyProperty.Register( "PropertiesLabel", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( "Properties:" ) );
-    public object PropertiesLabel
-    {
-      get
-      {
-        return ( object )GetValue( PropertiesLabelProperty );
-      }
-      set
-      {
-        SetValue( PropertiesLabelProperty, value );
-      }
-    }
-
-    #endregion  //PropertiesLabel
-
-    #region SelectedItem Property
-
-    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public object SelectedItem
-    {
-      get
-      {
-        return ( object )GetValue( SelectedItemProperty );
-      }
-      set
-      {
-        SetValue( SelectedItemProperty, value );
-      }
-    }
-
-    #endregion  //EditorDefinitions
-
-    #region TypeSelectionLabel Property
-
-    public static readonly DependencyProperty TypeSelectionLabelProperty = DependencyProperty.Register( "TypeSelectionLabel", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( "Select type:" ) );
-    public object TypeSelectionLabel
-    {
-      get
-      {
-        return ( object )GetValue( TypeSelectionLabelProperty );
-      }
-      set
-      {
-        SetValue( TypeSelectionLabelProperty, value );
-      }
-    }
-
-    #endregion  //TypeSelectionLabel
-
-    #region EditorDefinitions Property
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    #endregion  //EditorDefinitions
-
-    #endregion //Properties
-
-    #region Override Methods
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _newItemTypesComboBox != null )
-      {
-        _newItemTypesComboBox.Loaded -= new RoutedEventHandler( this.NewItemTypesComboBox_Loaded );
-      }
-      _newItemTypesComboBox = GetTemplateChild( PART_NewItemTypesComboBox ) as ComboBox;
-      if( _newItemTypesComboBox != null )
-      {
-        _newItemTypesComboBox.Loaded += new RoutedEventHandler( this.NewItemTypesComboBox_Loaded );
-      }
-
-      _listBox = this.GetTemplateChild( PART_ListBox ) as ListBox;
-
-      if( _propertyGrid != null )
-      {
-        _propertyGrid.PropertyValueChanged -= this.PropertyGrid_PropertyValueChanged;
-      }
-      _propertyGrid = GetTemplateChild( PART_PropertyGrid ) as PropertyGrid.PropertyGrid;
-      if( _propertyGrid != null )
-      {
-        _propertyGrid.PropertyValueChanged += this.PropertyGrid_PropertyValueChanged;
-      }
-    }
-
-    public PropertyGrid.PropertyGrid PropertyGrid
-    {
-      get
-      {
-        if( _propertyGrid == null )
-        {
-          this.ApplyTemplate();
-        }
-        return _propertyGrid;
-      }
-    }
-
-
-
-
-    #endregion
-
-    #region Constructors
-
-    static CollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionControl ), new FrameworkPropertyMetadata( typeof( CollectionControl ) ) );
-    }
-
-    public CollectionControl()
-    {
-      Items = new ObservableCollection<object>();
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.New, this.AddNew, this.CanAddNew ) );
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Delete, this.Delete, this.CanDelete ) );
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, this.Duplicate, this.CanDuplicate ) );
-      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveDown, this.MoveDown, this.CanMoveDown ) );
-      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveUp, this.MoveUp, this.CanMoveUp ) );
-    }
-
-    #endregion //Constructors
-
-    #region Events
-
-    #region ItemDeleting Event
-
-    public delegate void ItemDeletingRoutedEventHandler( object sender, ItemDeletingEventArgs e );
-
-    public static readonly RoutedEvent ItemDeletingEvent = EventManager.RegisterRoutedEvent( "ItemDeleting", RoutingStrategy.Bubble, typeof( ItemDeletingRoutedEventHandler ), typeof( CollectionControl ) );
-    public event ItemDeletingRoutedEventHandler ItemDeleting
-    {
-      add
-      {
-        AddHandler( ItemDeletingEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemDeletingEvent, value );
-      }
-    }
-
-    #endregion //ItemDeleting Event
-
-    #region ItemDeleted Event
-
-    public delegate void ItemDeletedRoutedEventHandler( object sender, ItemEventArgs e );
-
-    public static readonly RoutedEvent ItemDeletedEvent = EventManager.RegisterRoutedEvent( "ItemDeleted", RoutingStrategy.Bubble, typeof( ItemDeletedRoutedEventHandler ), typeof( CollectionControl ) );
-    public event ItemDeletedRoutedEventHandler ItemDeleted
-    {
-      add
-      {
-        AddHandler( ItemDeletedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemDeletedEvent, value );
-      }
-    }
-
-    #endregion //ItemDeleted Event
-
-    #region ItemAdding Event
-
-    public delegate void ItemAddingRoutedEventHandler( object sender, ItemAddingEventArgs e );
-
-    public static readonly RoutedEvent ItemAddingEvent = EventManager.RegisterRoutedEvent( "ItemAdding", RoutingStrategy.Bubble, typeof( ItemAddingRoutedEventHandler ), typeof( CollectionControl ) );
-    public event ItemAddingRoutedEventHandler ItemAdding
-    {
-      add
-      {
-        AddHandler( ItemAddingEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemAddingEvent, value );
-      }
-    }
-
-    #endregion //ItemAdding Event
-
-    #region ItemAdded Event
-
-    public delegate void ItemAddedRoutedEventHandler( object sender, ItemEventArgs e );
-
-    public static readonly RoutedEvent ItemAddedEvent = EventManager.RegisterRoutedEvent( "ItemAdded", RoutingStrategy.Bubble, typeof( ItemAddedRoutedEventHandler ), typeof( CollectionControl ) );
-    public event ItemAddedRoutedEventHandler ItemAdded
-    {
-      add
-      {
-        AddHandler( ItemAddedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemAddedEvent, value );
-      }
-    }
-
-    #endregion //ItemAdded Event
-
-    #region ItemMovedDown Event
-
-    public delegate void ItemMovedDownRoutedEventHandler( object sender, ItemEventArgs e );
-
-    public static readonly RoutedEvent ItemMovedDownEvent = EventManager.RegisterRoutedEvent( "ItemMovedDown", RoutingStrategy.Bubble, typeof( ItemMovedDownRoutedEventHandler ), typeof( CollectionControl ) );
-    public event ItemMovedDownRoutedEventHandler ItemMovedDown
-    {
-      add
-      {
-        AddHandler( ItemMovedDownEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemMovedDownEvent, value );
-      }
-    }
-
-    #endregion //ItemMovedDown Event
-
-    #region ItemMovedUp Event
-
-    public delegate void ItemMovedUpRoutedEventHandler( object sender, ItemEventArgs e );
-
-    public static readonly RoutedEvent ItemMovedUpEvent = EventManager.RegisterRoutedEvent( "ItemMovedUp", RoutingStrategy.Bubble, typeof( ItemMovedUpRoutedEventHandler ), typeof( CollectionControl ) );
-    public event ItemMovedUpRoutedEventHandler ItemMovedUp
-    {
-      add
-      {
-        AddHandler( ItemMovedUpEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemMovedUpEvent, value );
-      }
-    }
-
-    #endregion //ItemMovedUp Event
-
-    #endregion
-
-    #region EventHandlers
-
-    void NewItemTypesComboBox_Loaded( object sender, RoutedEventArgs e )
-    {
-      if( _newItemTypesComboBox != null )
-        _newItemTypesComboBox.SelectedIndex = 0;
-    }
-
-    private void PropertyGrid_PropertyValueChanged( object sender, PropertyGrid.PropertyValueChangedEventArgs e )
-    {
-      if( _listBox != null )
-      {
-        _listBox.Dispatcher.BeginInvoke( DispatcherPriority.Input, new Action( () =>
-        {
-          _listBox.Items.Refresh();
-        }
-        ) );
-      }
-    }
-
-    #endregion
-
-    #region Commands
-
-    private void AddNew( object sender, ExecutedRoutedEventArgs e )
-    {
-      var newItem = this.CreateNewItem( ( Type )e.Parameter );
-
-      this.AddNewCore( newItem );
-    }
-
-    private void CanAddNew( object sender, CanExecuteRoutedEventArgs e )
-    {
-      var t = e.Parameter as Type;
-      this.CanAddNewCore( t, e );
-    }
-
-    private void CanAddNewCore( Type t, CanExecuteRoutedEventArgs e )
-    {
-      if( ( t != null ) && !this.IsReadOnly )
-      {
-        var isComplexStruct = t.IsValueType && !t.IsEnum && !t.IsPrimitive;
-
-        if( isComplexStruct || ( t.GetConstructor( Type.EmptyTypes ) != null ) )
-        {
-          e.CanExecute = true;
-        }
-      }
-    }
-
-    private void AddNewCore( object newItem )
-    {
-      if( newItem == null )
-        throw new ArgumentNullException( "newItem" );
-
-      var eventArgs = new ItemAddingEventArgs( ItemAddingEvent, newItem );
-      this.RaiseEvent( eventArgs );
-      if( eventArgs.Cancel )
-        return;
-      newItem = eventArgs.Item;
-
-      this.Items.Add( newItem );
-
-      this.RaiseEvent( new ItemEventArgs( ItemAddedEvent, newItem ) );
-
-      this.SelectedItem = newItem;
-    }
-
-    private void Delete( object sender, ExecutedRoutedEventArgs e )
-    {
-      var eventArgs = new ItemDeletingEventArgs( ItemDeletingEvent, e.Parameter );
-      this.RaiseEvent( eventArgs );
-      if( eventArgs.Cancel )
-        return;
-
-      this.Items.Remove( e.Parameter );
-
-      this.RaiseEvent( new ItemEventArgs( ItemDeletedEvent, e.Parameter ) );
-    }
-
-    private void CanDelete( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = e.Parameter != null && !this.IsReadOnly;
-    }
-
-    private void Duplicate( object sender, ExecutedRoutedEventArgs e )
-    {
-      var newItem = this.DuplicateItem( e );
-      this.AddNewCore( newItem );
-    }
-
-    private void CanDuplicate( object sender, CanExecuteRoutedEventArgs e )
-    {
-      var t = (e.Parameter != null) ? e.Parameter.GetType() : null;
-      this.CanAddNewCore( t, e );
-    }
-
-    private object DuplicateItem( ExecutedRoutedEventArgs e )
-    {
-      if( e == null )
-        throw new ArgumentNullException( "e" );
-
-      var baseItem = e.Parameter;
-      var newItemType = baseItem.GetType();
-      var newItem = this.CreateNewItem( newItemType );
-
-      var type = newItemType;
-      while( type != null )
-      {
-        var baseProperties = type.GetFields( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
-        foreach( var prop in baseProperties )
-        {
-          prop.SetValue( newItem, prop.GetValue( baseItem ) );
-        }
-        type = type.BaseType;
-      }
-
-      return newItem;
-    }
-
-    private void MoveDown( object sender, ExecutedRoutedEventArgs e )
-    {
-      var selectedItem = e.Parameter;
-      var index = Items.IndexOf( selectedItem );
-      Items.RemoveAt( index );
-      Items.Insert( ++index, selectedItem );
-
-      this.RaiseEvent( new ItemEventArgs( ItemMovedDownEvent, selectedItem ) );
-
-      this.SelectedItem = selectedItem;
-    }
-
-    private void CanMoveDown( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( e.Parameter != null && Items.IndexOf( e.Parameter ) < ( Items.Count - 1 ) && !this.IsReadOnly )
-        e.CanExecute = true;
-    }
-
-    private void MoveUp( object sender, ExecutedRoutedEventArgs e )
-    {
-      var selectedItem = e.Parameter;
-      var index = Items.IndexOf( selectedItem );
-      this.Items.RemoveAt( index );
-      this.Items.Insert( --index, selectedItem );
-
-      this.RaiseEvent( new ItemEventArgs( ItemMovedUpEvent, selectedItem ) );
-
-      this.SelectedItem = selectedItem;
-    }
-
-    private void CanMoveUp( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( e.Parameter != null && Items.IndexOf( e.Parameter ) > 0 && !this.IsReadOnly )
-        e.CanExecute = true;
-    }
-
-    #endregion //Commands
-
-    #region Methods
-
-    public void PersistChanges()
-    {
-      this.PersistChanges( this.Items );
-    }
-
-    internal void PersistChanges( IList sourceList )
-    {
-      var collection = ComputeItemsSource();
-      if( collection == null )
-        return;
-
-      //IDictionary<T> and IDictionary
-      if( collection is IDictionary )
-      {
-        //For a Dictionary, we need to parse the list of EditableKeyValuePair and add KeyValuePair to the Dictionary.
-        var dict = (IDictionary)collection;
-        //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-        dict.Clear();
-
-        foreach( var item in sourceList )
-        {
-          var propInfoKey = item.GetType().GetProperty( "Key" );
-          var propInfoValue = item.GetType().GetProperty( "Value" );
-          if( (propInfoKey != null) && (propInfoValue != null) )
-          {
-            dict.Add( propInfoKey.GetValue( item, null ), propInfoValue.GetValue( item, null ) );
-          }
-        }
-      }
-      //IList
-      else if( collection is IList )
-      {
-        var list = (IList)collection;
-
-        //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-        list.Clear();
-
-        if( list.IsFixedSize )
-        {
-          if( sourceList.Count > list.Count )
-            throw new IndexOutOfRangeException("Exceeding array size.");
-
-          for( int i = 0; i < sourceList.Count; ++i )
-            list[ i ] = sourceList[ i ];
-        }
-        else
-        {
-          foreach( var item in sourceList )
-          {
-            list.Add( item );
-          }
-        }
-      }
-      else
-      {
-        //ICollection<T> (or IList<T>)
-        var collectionType = collection.GetType();
-        var iCollectionOfTInterface = collectionType.GetInterfaces().FirstOrDefault( x => x.IsGenericType && (x.GetGenericTypeDefinition() == typeof( ICollection<> )) );
-        if( iCollectionOfTInterface != null )
-        {
-          var argumentType = iCollectionOfTInterface.GetGenericArguments().FirstOrDefault();
-          if( argumentType != null )
-          {
-            var iCollectionOfTType = typeof( ICollection<> ).MakeGenericType( argumentType );
-
-            //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-            iCollectionOfTType.GetMethod( "Clear" ).Invoke( collection, null );
-
-            foreach( var item in sourceList )
-            {
-              iCollectionOfTType.GetMethod( "Add" ).Invoke( collection, new object[] { item } );
-            }
-          }
-        }
-      }
-    }
-
-    private IEnumerable CreateItemsSource()
-    {
-      IEnumerable collection = null;
-
-      if( ItemsSourceType != null )
-      {
-        var constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
-        if( constructor != null )
-        {
-          collection = ( IEnumerable )constructor.Invoke( null );
-        }
-        else if( ItemsSourceType.IsArray )
-        {
-          collection = Array.CreateInstance( ItemsSourceType.GetElementType(), Items.Count );
-        }
-      }
-
-      return collection;
-    }
-
-    private object CreateNewItem( Type type )
-    {
-      return Activator.CreateInstance( type );
-    }
-
-    private IEnumerable ComputeItemsSource()
-    {
-      if( ItemsSource == null )
-        ItemsSource = CreateItemsSource();
-
-      return ItemsSource;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
deleted file mode 100644
index 379fa047..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class CollectionControlButton : Button
-  {
-    #region Constructors
-
-    static CollectionControlButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionControlButton ), new FrameworkPropertyMetadata( typeof( CollectionControlButton ) ) );
-    }
-
-    public CollectionControlButton()
-    {
-      this.Click += this.CollectionControlButton_Click;
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region EditorDefinitions Property
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    #endregion  //EditorDefinitions
-
-    #region IsReadOnly Property
-
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControlButton ), new UIPropertyMetadata( false ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-
-    #endregion  //IsReadOnly
-
-    #region ItemsSource Property
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IEnumerable ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return ( IEnumerable )GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    #endregion  //ItemsSource
-
-    #region ItemsSourceType Property
-
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public Type ItemsSourceType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    #endregion //ItemsSourceType
-
-    #region NewItemTypes Property
-
-    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public IList<Type> NewItemTypes
-    {
-      get
-      {
-        return ( IList<Type> )GetValue( NewItemTypesProperty );
-      }
-      set
-      {
-        SetValue( NewItemTypesProperty, value );
-      }
-    }
-
-    #endregion  //NewItemTypes
-
-    #endregion
-
-    #region Base Class Overrides
-
-
-    #endregion
-
-    #region Methods
-
-    private void CollectionControlButton_Click( object sender, RoutedEventArgs e )
-    {
-      var collectionControlDialog = new CollectionControlDialog();
-      var binding = new Binding( "ItemsSource" ) { Source = this, Mode = BindingMode.TwoWay };
-      BindingOperations.SetBinding( collectionControlDialog, CollectionControlDialog.ItemsSourceProperty, binding );
-      collectionControlDialog.NewItemTypes = this.NewItemTypes;
-      collectionControlDialog.ItemsSourceType = this.ItemsSourceType;
-      collectionControlDialog.IsReadOnly = this.IsReadOnly;
-      collectionControlDialog.EditorDefinitions = this.EditorDefinitions;
-      collectionControlDialog.ShowDialog();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
deleted file mode 100644
index aec19954..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<local:CollectionControlDialogBase x:Class="Xceed.Wpf.Toolkit.CollectionControlDialog"
-                                   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                   xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                                   Title="Collection Control"
-                                   Height="400"
-                                   Width="600"
-                                   WindowStartupLocation="CenterScreen">
-
-   <Grid Margin="10">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="*" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <local:CollectionControl x:Name="_collectionControl"
-                               ItemsSourceType="{Binding ItemsSourceType, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                               ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Mode=TwoWay}"
-                               NewItemTypes="{Binding NewItemTypes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                               IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                               EditorDefinitions="{Binding EditorDefinitions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"/>
-
-      <StackPanel Orientation="Horizontal"
-                  Grid.Row="1"
-                  HorizontalAlignment="Right"
-                  Margin="5">
-         <Button Width="75"
-                 Margin="2"
-                 Click="OkButton_Click"
-                 IsDefault="True">OK</Button>
-         <Button Width="75"
-                 Margin="2"
-                 Click="CancelButton_Click"
-                 IsCancel="True">Cancel</Button>
-      </StackPanel>
-
-   </Grid>
-</local:CollectionControlDialogBase>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
deleted file mode 100644
index db766804..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Security;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public partial class CollectionControlDialogBase :
-    Window
-  {
-  }
-
-  /// <summary>
-  /// Interaction logic for CollectionControlDialog.xaml
-  /// </summary>
-  public partial class CollectionControlDialog : CollectionControlDialogBase
-  {
-    #region Private Members
-
-    private IList originalData = new List<object>();
-
-    #endregion
-
-    #region Properties
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IEnumerable ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return ( IEnumerable )GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public Type ItemsSourceType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public IList<Type> NewItemTypes
-    {
-      get
-      {
-        return ( IList<Type> )GetValue( NewItemTypesProperty );
-      }
-      set
-      {
-        SetValue( NewItemTypesProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControlDialog ), new UIPropertyMetadata( false ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    public CollectionControl CollectionControl
-    {
-      get
-      {
-        return _collectionControl;
-      }
-    }
-
-    #endregion //Properties
-
-    #region Constructors
-
-    public CollectionControlDialog()
-    {
-      InitializeComponent();
-    }
-
-    public CollectionControlDialog( Type itemsourceType )
-      : this()
-    {
-      ItemsSourceType = itemsourceType;
-    }
-
-    public CollectionControlDialog( Type itemsourceType, IList<Type> newItemTypes )
-      : this( itemsourceType )
-    {
-      NewItemTypes = newItemTypes;
-    }
-
-    #endregion //Constructors
-
-    #region Overrides
-
-    protected override void OnSourceInitialized( EventArgs e )
-    {
-      base.OnSourceInitialized( e );
-
-      //Backup data if case "Cancel" is clicked.
-      if( this.ItemsSource != null )
-      {
-        foreach( var item in this.ItemsSource )
-        {
-          originalData.Add( this.Clone( item ) );
-        }
-      }
-    }
-
-    #endregion
-
-    #region Event Handlers
-
-    private void OkButton_Click( object sender, RoutedEventArgs e )
-    {
-      if( this.ItemsSource is IDictionary )
-      {
-        if( !this.AreDictionaryKeysValid() )
-        {
-          MessageBox.Show( "All dictionary items should have distinct non-null Key values.", "Warning" );
-          return;
-        }
-      }
-
-      _collectionControl.PersistChanges();
-      this.DialogResult = true;
-      this.Close();
-    }
-
-    private void CancelButton_Click( object sender, RoutedEventArgs e )
-    {
-      _collectionControl.PersistChanges( originalData );
-      this.DialogResult = false;
-      this.Close();
-    }
-
-    #endregion //Event Hanlders
-
-    #region Private Methods
-
-    [SecuritySafeCritical]
-    private object Clone( object source )
-    {
-      if( source == null )
-        return null;
-
-      object result = null;
-      var sourceType = source.GetType();
-
-      if( source is Array )
-      {
-        using( var stream = new MemoryStream() )
-        {
-          var formatter = new BinaryFormatter();
-          formatter.Serialize( stream, source );
-          stream.Seek( 0, SeekOrigin.Begin );
-          result = ( Array )formatter.Deserialize( stream );
-        }
-      }
-      // For IDictionary, we need to create EditableKeyValuePair to edit the Key-Value.
-      else if( ( this.ItemsSource is IDictionary )
-        && sourceType.IsGenericType
-        && typeof( KeyValuePair<,> ).IsAssignableFrom( sourceType.GetGenericTypeDefinition() ) )
-      {
-        result = this.GenerateEditableKeyValuePair( source );
-      }
-      else
-      {
-        // Initialized a new object with default values
-        try
-        {
-          result = FormatterServices.GetUninitializedObject( sourceType );
-        }
-        catch( Exception )
-        {
-        }
-
-        var constructor = sourceType.GetConstructor( Type.EmptyTypes );
-        if( constructor != null )
-        {
-          constructor.Invoke( result, null );
-        }
-        else
-        {
-          result = source;
-        }
-      }
-      Debug.Assert( result != null );
-      if( result != null )
-      {
-        var properties = sourceType.GetProperties();
-
-        foreach( var propertyInfo in properties )
-        {
-          var parameters = propertyInfo.GetIndexParameters();
-          var index = parameters.GetLength( 0 ) == 0 ? null : new object[] { parameters.GetLength( 0 ) - 1 };
-          var propertyInfoValue = propertyInfo.GetValue( source, index );
-
-          if( propertyInfo.CanWrite )
-          {
-            // Look for nested object
-            if( propertyInfo.PropertyType.IsClass
-              && ( propertyInfo.PropertyType != typeof( Transform ) )
-              && !propertyInfo.PropertyType.Equals( typeof( string ) ) )
-            {
-              // We have a Collection/List of T.
-              if( propertyInfo.PropertyType.IsGenericType )
-              {
-                // Clone sub-objects if the T are non-primitive types objects. 
-                var arg = propertyInfo.PropertyType.GetGenericArguments().FirstOrDefault();
-                if( ( arg != null ) && !arg.IsPrimitive && !arg.Equals( typeof( String ) ) && !arg.IsEnum )
-                {
-                  var nestedObject = this.Clone( propertyInfoValue );
-                  propertyInfo.SetValue( result, nestedObject, null );
-                }
-                else
-                {
-                  // copy object if the T are primitive types objects.
-                  propertyInfo.SetValue( result, propertyInfoValue, null );
-                }
-              }
-              else
-              {
-                var nestedObject = this.Clone( propertyInfoValue );
-                if( nestedObject != null )
-                {
-                  // For T object included in List/Collections, Add it to the List/Collection of T.
-                  if( index != null )
-                  {
-                    result.GetType().GetMethod( "Add" ).Invoke( result, new[] { nestedObject } );
-                  }
-                  else
-                  {
-                    propertyInfo.SetValue( result, nestedObject, null );
-                  }
-                }
-              }
-            }
-            else
-            {
-              // For T object included in List/Collections, Add it to the List/Collection of T.
-              if( index != null )
-              {
-                result.GetType().GetMethod( "Add" ).Invoke( result, new[] { propertyInfoValue } );
-              }
-              else
-              {
-                // copy regular object
-                propertyInfo.SetValue( result, propertyInfoValue, null );
-              }
-            }
-          }
-        }
-      }
-
-      return result;
-    }
-
-    private object GenerateEditableKeyValuePair( object source )
-    {
-      var sourceType = source.GetType();
-      if( ( sourceType.GetGenericArguments() == null ) || ( sourceType.GetGenericArguments().GetLength( 0 ) != 2 ) )
-        return null;
-
-      var propInfoKey = sourceType.GetProperty( "Key" );
-      var propInfoValue = sourceType.GetProperty( "Value" );
-      if( ( propInfoKey != null ) && ( propInfoValue != null ) )
-      {
-        return ListUtilities.CreateEditableKeyValuePair( propInfoKey.GetValue( source, null )
-                                                          , sourceType.GetGenericArguments()[ 0 ]
-                                                          , propInfoValue.GetValue( source, null )
-                                                          , sourceType.GetGenericArguments()[ 1 ] );
-      }
-      return null;
-    }
-
-    private bool AreDictionaryKeysValid()
-    {
-      var keys = _collectionControl.Items.Select( x =>
-      {
-        var keyType = x.GetType().GetProperty( "Key" );
-        if( keyType != null )
-        {
-          return keyType.GetValue( x, null );
-        }
-        return null;
-      } );
-
-      return ( keys.Distinct().Count() == _collectionControl.Items.Count )
-             && keys.All( x => x != null );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
deleted file mode 100644
index d0ccf3e4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Converters
-{
-  /// <summary>
-  /// This multi-value converter is used in the CollectionControl template
-  /// to determine the list of possible new item types that will be shown in the combo box.
-  /// 
-  /// If the second value (i.e., CollectionControl.NewItemTypes) is not null, this list will be used.
-  /// Otherwise, if the first value (i.e., CollectionControl.ItemsSourceType) is a "IList&lt;T&gt;"
-  /// type, the new item type list will contain "T".
-  /// 
-  /// </summary>
-  public class NewItemTypesComboBoxConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    {
-
-      if( values.Length != 2 )
-        throw new ArgumentException("The 'values' argument should contain 2 objects.");
-
-      if( values[ 1 ] != null )
-      {
-        if( !values[ 1 ].GetType().IsGenericType || !(values[ 1 ].GetType().GetGenericArguments().First().GetType() is Type) )
-          throw new ArgumentException( "The 'value' argument is not of the correct type." );
-
-        return values[ 1 ];
-      }
-      else if( values[ 0 ] != null )
-      {
-        if( !( values[ 0 ].GetType() is Type ) )
-          throw new ArgumentException( "The 'value' argument is not of the correct type." );
-
-        List<Type> types = new List<Type>();
-        Type listType = ListUtilities.GetListItemType( ( Type )values[ 0 ] );
-        if( listType != null )
-        {
-          types.Add( listType );
-        }
-
-        return types;
-      }
-
-      return null;
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
deleted file mode 100644
index 12d3bb47..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.Core;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ItemAddingEventArgs : CancelRoutedEventArgs
-  {
-    #region Constructor
-
-    public ItemAddingEventArgs( RoutedEvent itemAddingEvent, object itemAdding )
-      : base( itemAddingEvent )
-    {
-      Item = itemAdding;
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Item Property
-
-    public object Item
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #endregion //Properties
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
deleted file mode 100644
index d8343bdd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.Core;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ItemDeletingEventArgs : CancelRoutedEventArgs
-  {
-    #region Private Members
-
-    private object _item;
-
-    #endregion
-
-    #region Constructor
-
-    public ItemDeletingEventArgs( RoutedEvent itemDeletingEvent, object itemDeleting )
-      : base( itemDeletingEvent )
-    {
-      _item = itemDeleting;
-    }
-
-    #region Property Item
-
-    public object Item
-    {
-      get
-      {
-        return _item;
-      }
-    }
-
-    #endregion
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
deleted file mode 100644
index aa45304a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ItemEventArgs : RoutedEventArgs
-  {
-    #region Protected Members
-
-    private object _item;
-
-    #endregion
-
-    #region Constructor
-
-    internal ItemEventArgs( RoutedEvent routedEvent, object newItem )
-      : base( routedEvent )
-    {
-      _item = newItem;
-    }
-
-    #endregion
-
-    #region Property Item
-
-    public object Item
-    {
-      get
-      {
-        return _item;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
deleted file mode 100644
index 1fc0ab77..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class PrimitiveTypeCollectionControl : ContentControl
-  {
-    #region Members
-
-    bool _surpressTextChanged;
-    bool _conversionFailed;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PrimitiveTypeCollectionControl primitiveTypeCollectionControl = o as PrimitiveTypeCollectionControl;
-      if( primitiveTypeCollectionControl != null )
-        primitiveTypeCollectionControl.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-
-    }
-
-    #endregion //IsOpen
-
-    #region ItemsSource
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
-    public IList ItemsSource
-    {
-      get
-      {
-        return ( IList )GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    private static void OnItemsSourceChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PrimitiveTypeCollectionControl primitiveTypeCollectionControl = o as PrimitiveTypeCollectionControl;
-      if( primitiveTypeCollectionControl != null )
-        primitiveTypeCollectionControl.OnItemsSourceChanged( ( IList )e.OldValue, ( IList )e.NewValue );
-    }
-
-    protected virtual void OnItemsSourceChanged( IList oldValue, IList newValue )
-    {
-      if( newValue == null )
-        return;
-
-      if( ItemsSourceType == null )
-        ItemsSourceType = newValue.GetType();
-
-      if( ItemType == null && newValue.GetType().ContainsGenericParameters )
-        ItemType = newValue.GetType().GetGenericArguments()[ 0 ];
-
-      SetText( newValue );
-    }
-
-    #endregion //ItemsSource
-
-    #region IsReadOnly
-
-    public static readonly DependencyProperty IsReadOnlyProperty =
-        DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( false ) );
-
-    public bool IsReadOnly
-    {
-      get { return ( bool )GetValue( IsReadOnlyProperty ); }
-      set { SetValue( IsReadOnlyProperty, value ); }
-    }
-
-    #endregion //IsReadOnly
-
-    #region ItemsSourceType
-
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null ) );
-    public Type ItemsSourceType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    #endregion ItemsSourceType
-
-    #region ItemType
-
-    public static readonly DependencyProperty ItemTypeProperty = DependencyProperty.Register( "ItemType", typeof( Type ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null ) );
-    public Type ItemType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemTypeProperty, value );
-      }
-    }
-
-    #endregion ItemType
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null, OnTextChanged ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PrimitiveTypeCollectionControl primitiveTypeCollectionControl = o as PrimitiveTypeCollectionControl;
-      if( primitiveTypeCollectionControl != null )
-        primitiveTypeCollectionControl.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnTextChanged( string oldValue, string newValue )
-    {
-      if( !_surpressTextChanged )
-        PersistChanges();
-    }
-
-    #endregion //Text
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static PrimitiveTypeCollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PrimitiveTypeCollectionControl ), new FrameworkPropertyMetadata( typeof( PrimitiveTypeCollectionControl ) ) );
-    }
-
-    public PrimitiveTypeCollectionControl()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Overrides
-
-
-#endregion
-
-    #region Methods
-
-    private void PersistChanges()
-    {
-      IList list = ComputeItemsSource();
-      if( list == null )
-        return;
-
-      IList items = ComputeItems();
-
-      //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-      list.Clear();
-
-      int counter = 0;
-      foreach( var item in items )
-      {
-        if( list is Array )
-        {
-           ( ( Array )list ).SetValue( item, counter++);
-        }
-        else
-        {
-          list.Add( item );
-        }
-      };
-
-      // if something went wrong during conversion we want to reload the text to show only valid entries
-      if( _conversionFailed )
-        SetText( list );
-    }
-
-    private IList ComputeItems()
-    {
-      IList items = new List<object>();
-
-      if( ItemType == null )
-        return items;
-
-      string[] textArray = Text.Split( '\n' );
-
-      foreach( string s in textArray )
-      {
-        string valueString = s.TrimEnd( '\r' );
-        if( !String.IsNullOrEmpty( valueString ) )
-        {
-          object value = null;
-          try
-          {
-            if( ItemType.IsEnum )
-            {
-              value = Enum.Parse( ItemType, valueString );
-            }
-            else
-            {
-              value = Convert.ChangeType( valueString, ItemType );
-            }
-          }
-          catch
-          {
-            //a conversion failed
-            _conversionFailed = true;
-          }
-
-          if( value != null )
-            items.Add( value );
-        }
-      }
-
-      return items;
-    }
-
-    private IList ComputeItemsSource()
-    {
-      if( ItemsSource == null )
-      {
-        // Save current text since creating the ItemsSource will reset it
-        string currentText = this.Text;
-        ItemsSource = CreateItemsSource();
-        this.Text = currentText;
-      }
-
-      return ItemsSource;
-    }
-
-    private IList CreateItemsSource()
-    {
-      IList list = null;
-
-      if( ItemsSourceType != null )
-      {
-        ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
-        list = ( IList )constructor.Invoke( null );
-      }
-
-      return list;
-    }
-
-    private void SetText( IEnumerable collection )
-    {
-      _surpressTextChanged = true;
-      StringBuilder builder = new StringBuilder();
-      foreach( object obj2 in collection )
-      {
-        builder.Append( obj2.ToString() );
-        builder.AppendLine();
-      }
-      Text = builder.ToString().Trim();
-      _surpressTextChanged = false;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 87404edb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,334 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:colconv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
-  <colconv:NewItemTypesComboBoxConverter x:Key="NewItemTypesComboBoxConverter" />
-
-  <Style x:Key="CollectionControlButtonStyle"
-         TargetType="{x:Type Button}">
-    <Style.Triggers>
-      <Trigger Property="IsEnabled"
-               Value="false">
-        <Setter Property="Opacity"
-                Value="0.6" />
-      </Trigger>
-    </Style.Triggers>
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Height"
-            Value="26" />
-    <Setter Property="Width"
-            Value="26" />
-  </Style>
-
-  <Style TargetType="{x:Type local:CollectionControl}">
-    <Style.Resources>
-      <Style TargetType="ListBox">
-        <Setter Property="ItemTemplate">
-          <Setter.Value>
-            <DataTemplate>
-              <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-            </DataTemplate>
-          </Setter.Value>
-        </Setter>
-      </Style>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CollectionControl}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid  Margin="{TemplateBinding Padding}">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="1.5*" />
-              </Grid.ColumnDefinitions>
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-                <ContentControl Margin="0,0,0,5"
-                                Content="{TemplateBinding TypeSelectionLabel}">
-                </ContentControl>
-                <ComboBox x:Name="PART_NewItemTypesComboBox"
-                          Grid.Row="1"
-                          Margin="0,0,0,3"
-                          HorizontalAlignment="Stretch">
-                  <ComboBox.ItemsSource>
-                    <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="ItemsSourceType" />
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="NewItemTypes" />
-                    </MultiBinding>
-                  </ComboBox.ItemsSource>
-                  <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                      <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-                    </DataTemplate>
-                  </ComboBox.ItemTemplate>
-                </ComboBox>
-                <Button Margin="3,0,0,3"
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Padding="5,0"
-                        Content="Add"
-                        Command="New"
-                        CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}">
-                </Button>
-                <ListBox x:Name="PART_ListBox"
-                         Grid.Row="2"
-                         Grid.ColumnSpan="2"
-                         ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedIndex="0">
-                </ListBox>
-                <StackPanel Margin="7,2,0,0"
-                            VerticalAlignment="Top"
-                            Grid.Column="2"
-                            Grid.Row="2">
-                  <Button Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="ComponentCommands.MoveUp"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Path Fill="#FF000000"
-                          Data="F0 M 6,0 L 12,7 8,7 8,12 4,12 4,7 0,7 Z" />
-                  </Button>
-                  <Button Margin="0,1,0,0"
-                          Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="ComponentCommands.MoveDown"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Path Fill="#FF000000"
-                          Data="F0 M 4,0 L 8,0 8,5 12,5 6,12 0,5 4,5 Z" />
-                  </Button>
-                  <Button Margin="0,7,0,0"
-                          Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="Delete"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Delete16.png">
-                    </Image>
-                  </Button>
-                  <Button Margin="0,7,0,0"
-                          Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="Copy"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Duplicate.png">
-                    </Image>
-                  </Button>
-                </StackPanel>
-              </Grid>
-              <Grid Column="1"
-                    Margin="20,0,0,0">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-                <ContentControl Grid.Column="1"
-                                Content="{TemplateBinding PropertiesLabel}">
-                </ContentControl>
-                <pg:PropertyGrid x:Name="PART_PropertyGrid"
-                                 Grid.Row="1"
-                                 Grid.Column="1"
-                                 Margin="0,5,0,0"
-                                 HorizontalAlignment="Stretch"
-                                 VerticalAlignment="Stretch"
-                                 SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                 IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                 EditorDefinitions="{Binding EditorDefinitions, RelativeSource={RelativeSource TemplatedParent}}"/>
-              </Grid>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                      TargetName="PART_NewItemTypesComboBox" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="PrimitiveTypeCollectionControl"
-         TargetType="{x:Type local:PrimitiveTypeCollectionControl}">
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Padding"
-            Value="2,0,0,0" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:PrimitiveTypeCollectionControl}">
-          <local:MultiLineTextEditor Background="{TemplateBinding Background}"
-                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                     Content="{TemplateBinding Content}"
-                                     ContentTemplate="{TemplateBinding ContentTemplate}"
-                                     Padding="{TemplateBinding Padding}"
-                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     IsOpen="{TemplateBinding IsOpen}"
-                                     IsReadOnly="{TemplateBinding IsReadOnly}"
-                                     Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     DropDownWidth="{TemplateBinding ActualWidth}" />
-
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocusWithin"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:PrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}" />
-
-  <Style x:Key="CollectionControlButton"
-         TargetType="{x:Type local:CollectionControlButton}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Padding"
-            Value="2,0,0,0" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Left" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-    <Setter Property="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="MinHeight"
-            Value="22" />
-    <Setter Property="IsTabStop"
-            Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Grid SnapsToDevicePixels="True">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-
-              <Border Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Padding="{TemplateBinding Padding}"
-                      SnapsToDevicePixels="True">
-                <ContentPresenter Content="{TemplateBinding Content}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-              </Border>
-
-              <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                   Grid.Column="1"
-                                   CornerRadius="0,2.75,2.75,0"
-                                   RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CollectionControlButton}}"
-                                   RenderMouseOver="{TemplateBinding IsMouseOver}">
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="Gray" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:CollectionControlButton}"
-         BasedOn="{StaticResource CollectionControlButton}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
deleted file mode 100644
index 6b1390ff..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
+++ /dev/null
@@ -1,327 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:colconv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
-  <colconv:NewItemTypesComboBoxConverter x:Key="NewItemTypesComboBoxConverter" />
-
-  <Style x:Key="CollectionControlButtonStyle"
-         TargetType="{x:Type Button}">
-    <Style.Triggers>
-      <Trigger Property="IsEnabled"
-               Value="false">
-        <Setter Property="Opacity"
-                Value="0.6" />
-      </Trigger>
-    </Style.Triggers>
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Height"
-            Value="26" />
-    <Setter Property="Width"
-            Value="26" />
-  </Style>
-
-  <Style TargetType="{x:Type local:CollectionControl}">
-    <Style.Resources>
-      <Style TargetType="ListBox">
-        <Setter Property="ItemTemplate">
-          <Setter.Value>
-            <DataTemplate>
-              <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-            </DataTemplate>
-          </Setter.Value>
-        </Setter>
-      </Style>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CollectionControl}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid Margin="{TemplateBinding Padding}">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="1.5*" />
-              </Grid.ColumnDefinitions>
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-                <ContentControl Margin="0,0,0,5"
-                                Content="{TemplateBinding TypeSelectionLabel}">
-                </ContentControl>
-                <ComboBox x:Name="PART_NewItemTypesComboBox"
-                          Grid.Row="1"
-                          Margin="0,0,0,3"
-                          HorizontalAlignment="Stretch">
-                  <ComboBox.ItemsSource>
-                    <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="ItemsSourceType" />
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="NewItemTypes" />
-                    </MultiBinding>
-                  </ComboBox.ItemsSource>
-                  <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                      <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-                    </DataTemplate>
-                  </ComboBox.ItemTemplate>
-                </ComboBox>
-                <Button Margin="3,0,0,3"
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Padding="5,0"
-                        Content="Add"
-                        Command="New"
-                        CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" >
-                </Button>
-                <ListBox x:Name="PART_ListBox"
-                         Grid.Row="2"
-                         Grid.ColumnSpan="2"
-                         ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedIndex="0">
-                </ListBox>
-                <StackPanel Margin="7,2,0,0"
-                            VerticalAlignment="Top"
-                            Grid.Column="2"
-                            Grid.Row="2">
-                  <Button Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="ComponentCommands.MoveUp"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Path Fill="#FF404040"
-                          Data="F0 M 6,0 L 12,7 8,7 8,12 4,12 4,7 0,7 Z" />
-                  </Button>
-                  <Button Margin="0,1,0,0"
-                          Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="ComponentCommands.MoveDown"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Path Fill="#FF404040"
-                          Data="F0 M 4,0 L 8,0 8,5 12,5 6,12 0,5 4,5 Z" />
-                  </Button>
-                  <Button Margin="0,7,0,0"
-                          Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="Delete"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Delete16.png" >
-                    </Image>
-                  </Button>
-                  <Button Margin="0,7,0,0"
-                          Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="Copy"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Duplicate.png">
-                    </Image>
-                  </Button>
-                </StackPanel>
-              </Grid>
-              <Grid Column="1"
-                    Margin="20,0,0,0">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-                <ContentControl Grid.Column="1"
-                                Content="{TemplateBinding PropertiesLabel}">
-                </ContentControl>
-                <pg:PropertyGrid x:Name="PART_PropertyGrid"
-                                 Grid.Row="1"
-                                 Grid.Column="1"
-                                 Margin="0,5,0,0"
-                                 HorizontalAlignment="Stretch"
-                                 VerticalAlignment="Stretch"
-                                 SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                 IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                 EditorDefinitions="{Binding EditorDefinitions, RelativeSource={RelativeSource TemplatedParent}}"/>
-              </Grid>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                      TargetName="PART_NewItemTypesComboBox" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="PrimitiveTypeCollectionControl"
-         TargetType="{x:Type local:PrimitiveTypeCollectionControl}">
-    <Setter Property="BorderBrush">
-      <Setter.Value>
-        <LinearGradientBrush EndPoint="0.5,1"
-                             StartPoint="0.5,0">
-          <GradientStop Color="#FFA3AEB9"
-                        Offset="0" />
-          <GradientStop Color="#FF8399A9"
-                        Offset="0.375" />
-          <GradientStop Color="#FF718597"
-                        Offset="0.375" />
-          <GradientStop Color="#FF617584"
-                        Offset="1" />
-        </LinearGradientBrush>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Padding"
-            Value="2,0,0,0" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:PrimitiveTypeCollectionControl}">
-          <local:MultiLineTextEditor Background="{TemplateBinding Background}"
-                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                     Content="{TemplateBinding Content}"
-                                     ContentTemplate="{TemplateBinding ContentTemplate}"
-                                     Padding="{TemplateBinding Padding}"
-                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     IsOpen="{TemplateBinding IsOpen}"
-                                     IsReadOnly="{TemplateBinding IsReadOnly}"
-                                     Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     DropDownWidth="{TemplateBinding ActualWidth}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:PrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}" />
-
-  <Style x:Key="CollectionControlButton"
-         TargetType="{x:Type local:CollectionControlButton}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Padding"
-            Value="2,0,0,0" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Left" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-    <Setter Property="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="MinHeight"
-            Value="22" />
-    <Setter Property="IsTabStop"
-            Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Grid SnapsToDevicePixels="True">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-
-              <Border Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Padding="{TemplateBinding Padding}"
-                      SnapsToDevicePixels="True">
-                <ContentPresenter Content="{TemplateBinding Content}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-              </Border>
-
-              <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                   Grid.Column="1"
-                                   CornerRadius="0,2.75,2.75,0"
-                                   RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CollectionControlButton}}"
-                                   RenderMouseOver="{TemplateBinding IsMouseOver}">
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="Gray" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:CollectionControlButton}"
-         BasedOn="{StaticResource CollectionControlButton}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
deleted file mode 100644
index 8ad8ec1e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
+++ /dev/null
@@ -1,635 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.IO;
-using System;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_ColorShadingCanvas, Type = typeof( Canvas ) )]
-  [TemplatePart( Name = PART_ColorShadeSelector, Type = typeof( Canvas ) )]
-  [TemplatePart( Name = PART_SpectrumSlider, Type = typeof( ColorSpectrumSlider ) )]
-  [TemplatePart( Name = PART_HexadecimalTextBox, Type = typeof( TextBox ) )]
-  public class ColorCanvas : Control
-  {
-    private const string PART_ColorShadingCanvas = "PART_ColorShadingCanvas";
-    private const string PART_ColorShadeSelector = "PART_ColorShadeSelector";
-    private const string PART_SpectrumSlider = "PART_SpectrumSlider";
-    private const string PART_HexadecimalTextBox = "PART_HexadecimalTextBox";
-
-    #region Private Members
-
-    private TranslateTransform _colorShadeSelectorTransform = new TranslateTransform();
-    private Canvas _colorShadingCanvas;
-    private Canvas _colorShadeSelector;
-    private ColorSpectrumSlider _spectrumSlider;
-    private TextBox _hexadecimalTextBox;
-    private Point? _currentColorPosition;
-    private bool _surpressPropertyChanged;
-    private bool _updateSpectrumSliderValue = true;
-
-    #endregion //Private Members
-
-    #region Properties
-
-    #region SelectedColor
-
-    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color? ), typeof( ColorCanvas ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedColorChanged ) );
-    public Color? SelectedColor
-    {
-      get
-      {
-        return ( Color? )GetValue( SelectedColorProperty );
-      }
-      set
-      {
-        SetValue( SelectedColorProperty, value );
-      }
-    }
-
-    private static void OnSelectedColorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnSelectedColorChanged( ( Color? )e.OldValue, ( Color? )e.NewValue );
-    }
-
-    protected virtual void OnSelectedColorChanged( Color? oldValue, Color? newValue )
-    {
-      SetHexadecimalStringProperty( GetFormatedColorString( newValue ), false );
-      UpdateRGBValues( newValue );
-      UpdateColorShadeSelectorPosition( newValue );
-
-      RoutedPropertyChangedEventArgs<Color?> args = new RoutedPropertyChangedEventArgs<Color?>( oldValue, newValue );
-      args.RoutedEvent = SelectedColorChangedEvent;
-      RaiseEvent( args );
-    }
-
-    #endregion //SelectedColor
-
-    #region RGB
-
-    #region A
-
-    public static readonly DependencyProperty AProperty = DependencyProperty.Register( "A", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )255, OnAChanged ) );
-    public byte A
-    {
-      get
-      {
-        return ( byte )GetValue( AProperty );
-      }
-      set
-      {
-        SetValue( AProperty, value );
-      }
-    }
-
-    private static void OnAChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnAChanged( ( byte )e.OldValue, ( byte )e.NewValue );
-    }
-
-    protected virtual void OnAChanged( byte oldValue, byte newValue )
-    {
-      if( !_surpressPropertyChanged )
-        UpdateSelectedColor();
-    }
-
-    #endregion //A
-
-    #region R
-
-    public static readonly DependencyProperty RProperty = DependencyProperty.Register( "R", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnRChanged ) );
-    public byte R
-    {
-      get
-      {
-        return ( byte )GetValue( RProperty );
-      }
-      set
-      {
-        SetValue( RProperty, value );
-      }
-    }
-
-    private static void OnRChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnRChanged( ( byte )e.OldValue, ( byte )e.NewValue );
-    }
-
-    protected virtual void OnRChanged( byte oldValue, byte newValue )
-    {
-      if( !_surpressPropertyChanged )
-        UpdateSelectedColor();
-    }
-
-    #endregion //R
-
-    #region G
-
-    public static readonly DependencyProperty GProperty = DependencyProperty.Register( "G", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnGChanged ) );
-    public byte G
-    {
-      get
-      {
-        return ( byte )GetValue( GProperty );
-      }
-      set
-      {
-        SetValue( GProperty, value );
-      }
-    }
-
-    private static void OnGChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnGChanged( ( byte )e.OldValue, ( byte )e.NewValue );
-    }
-
-    protected virtual void OnGChanged( byte oldValue, byte newValue )
-    {
-      if( !_surpressPropertyChanged )
-        UpdateSelectedColor();
-    }
-
-    #endregion //G
-
-    #region B
-
-    public static readonly DependencyProperty BProperty = DependencyProperty.Register( "B", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnBChanged ) );
-    public byte B
-    {
-      get
-      {
-        return ( byte )GetValue( BProperty );
-      }
-      set
-      {
-        SetValue( BProperty, value );
-      }
-    }
-
-    private static void OnBChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnBChanged( ( byte )e.OldValue, ( byte )e.NewValue );
-    }
-
-    protected virtual void OnBChanged( byte oldValue, byte newValue )
-    {
-      if( !_surpressPropertyChanged )
-        UpdateSelectedColor();
-    }
-
-    #endregion //B
-
-    #endregion //RGB
-
-    #region HexadecimalString
-
-    public static readonly DependencyProperty HexadecimalStringProperty = DependencyProperty.Register( "HexadecimalString", typeof( string ), typeof( ColorCanvas ), new UIPropertyMetadata( "", OnHexadecimalStringChanged, OnCoerceHexadecimalString ) );
-    public string HexadecimalString
-    {
-      get
-      {
-        return ( string )GetValue( HexadecimalStringProperty );
-      }
-      set
-      {
-        SetValue( HexadecimalStringProperty, value );
-      }
-    }
-
-    private static void OnHexadecimalStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnHexadecimalStringChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnHexadecimalStringChanged( string oldValue, string newValue )
-    {
-      string newColorString = GetFormatedColorString( newValue );
-      string currentColorString = GetFormatedColorString( SelectedColor );
-      if( !currentColorString.Equals( newColorString ) )
-      {
-        Color? col = null;
-        if( !string.IsNullOrEmpty( newColorString ) )
-        {
-          col = ( Color )ColorConverter.ConvertFromString( newColorString );      
-        }
-        UpdateSelectedColor( col );
-      }
-
-      SetHexadecimalTextBoxTextProperty( newValue );
-    }
-
-    private static object OnCoerceHexadecimalString( DependencyObject d, object basevalue )
-    {
-      var colorCanvas = ( ColorCanvas )d;
-      if( colorCanvas == null )
-        return basevalue;
-
-      return colorCanvas.OnCoerceHexadecimalString( basevalue );
-    }
-
-    private object OnCoerceHexadecimalString( object newValue )
-    {
-      var value = newValue as string;
-      string retValue = value;
-
-      try
-      {
-        if( !string.IsNullOrEmpty( retValue ) )
-        {
-          int outValue;
-          // User has entered an hexadecimal value (without the "#" character)... add it.
-          if( Int32.TryParse( retValue, System.Globalization.NumberStyles.HexNumber, null, out outValue ) )
-          {
-            retValue = "#" + retValue;
-          }
-          ColorConverter.ConvertFromString( retValue );
-        }
-      }
-      catch
-      {
-        //When HexadecimalString is changed via Code-Behind and hexadecimal format is bad, throw.
-        throw new InvalidDataException( "Color provided is not in the correct format." );
-      }
-
-      return retValue;
-    }
-
-    #endregion //HexadecimalString
-
-    #region UsingAlphaChannel
-
-    public static readonly DependencyProperty UsingAlphaChannelProperty = DependencyProperty.Register( "UsingAlphaChannel", typeof( bool ), typeof( ColorCanvas ), new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnUsingAlphaChannelPropertyChanged ) ) );
-    public bool UsingAlphaChannel
-    {
-      get
-      {
-        return ( bool )GetValue( UsingAlphaChannelProperty );
-      }
-      set
-      {
-        SetValue( UsingAlphaChannelProperty, value );
-      }
-    }
-
-    private static void OnUsingAlphaChannelPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnUsingAlphaChannelChanged();
-    }
-
-    protected virtual void OnUsingAlphaChannelChanged()
-    {
-      SetHexadecimalStringProperty( GetFormatedColorString( SelectedColor ), false );
-    }
-
-    #endregion //UsingAlphaChannel
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static ColorCanvas()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorCanvas ), new FrameworkPropertyMetadata( typeof( ColorCanvas ) ) );
-    }
-
-    public ColorCanvas()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _colorShadingCanvas != null )
-      {
-        _colorShadingCanvas.MouseLeftButtonDown -= ColorShadingCanvas_MouseLeftButtonDown;
-        _colorShadingCanvas.MouseLeftButtonUp -= ColorShadingCanvas_MouseLeftButtonUp;
-        _colorShadingCanvas.MouseMove -= ColorShadingCanvas_MouseMove;
-        _colorShadingCanvas.SizeChanged -= ColorShadingCanvas_SizeChanged;
-      }
-
-      _colorShadingCanvas = GetTemplateChild( PART_ColorShadingCanvas ) as Canvas;
-
-      if( _colorShadingCanvas != null )
-      {
-        _colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown;
-        _colorShadingCanvas.MouseLeftButtonUp += ColorShadingCanvas_MouseLeftButtonUp;
-        _colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove;
-        _colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged;
-      }
-
-      _colorShadeSelector = GetTemplateChild( PART_ColorShadeSelector ) as Canvas;
-
-      if( _colorShadeSelector != null )
-        _colorShadeSelector.RenderTransform = _colorShadeSelectorTransform;
-
-      if( _spectrumSlider != null )
-        _spectrumSlider.ValueChanged -= SpectrumSlider_ValueChanged;
-
-      _spectrumSlider = GetTemplateChild( PART_SpectrumSlider ) as ColorSpectrumSlider;
-
-      if( _spectrumSlider != null )
-        _spectrumSlider.ValueChanged += SpectrumSlider_ValueChanged;
-
-      if( _hexadecimalTextBox != null )
-        _hexadecimalTextBox.LostFocus -= new RoutedEventHandler( HexadecimalTextBox_LostFocus );
-
-      _hexadecimalTextBox = GetTemplateChild( PART_HexadecimalTextBox ) as TextBox;
-
-      if( _hexadecimalTextBox != null )
-        _hexadecimalTextBox.LostFocus += new RoutedEventHandler( HexadecimalTextBox_LostFocus );
-
-      UpdateRGBValues( SelectedColor );
-      UpdateColorShadeSelectorPosition( SelectedColor );
-
-      // When changing theme, HexadecimalString needs to be set since it is not binded.
-      SetHexadecimalTextBoxTextProperty( GetFormatedColorString( SelectedColor ) );
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      base.OnKeyDown( e );
-
-      //hitting enter on textbox will update Hexadecimal string
-      if( e.Key == Key.Enter && e.OriginalSource is TextBox )
-      {
-        TextBox textBox = ( TextBox )e.OriginalSource;
-        if( textBox.Name == PART_HexadecimalTextBox )
-          SetHexadecimalStringProperty( textBox.Text, true );
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    void ColorShadingCanvas_MouseLeftButtonDown( object sender, MouseButtonEventArgs e )
-    {
-      if( _colorShadingCanvas != null )
-      {
-        Point p = e.GetPosition( _colorShadingCanvas );
-        UpdateColorShadeSelectorPositionAndCalculateColor( p, true );
-        _colorShadingCanvas.CaptureMouse();
-        //Prevent from closing ColorCanvas after mouseDown in ListView
-        e.Handled = true;
-      }
-    }
-
-    void ColorShadingCanvas_MouseLeftButtonUp( object sender, MouseButtonEventArgs e )
-    {
-      if( _colorShadingCanvas != null )
-      {
-        _colorShadingCanvas.ReleaseMouseCapture();
-      }
-    }
-
-    void ColorShadingCanvas_MouseMove( object sender, MouseEventArgs e )
-    {
-      if( _colorShadingCanvas != null )
-      {
-        if( e.LeftButton == MouseButtonState.Pressed )
-        {
-          Point p = e.GetPosition( _colorShadingCanvas );
-          UpdateColorShadeSelectorPositionAndCalculateColor( p, true );
-          Mouse.Synchronize();
-        }
-      }
-    }
-
-    void ColorShadingCanvas_SizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      if( _currentColorPosition != null )
-      {
-        Point _newPoint = new Point
-        {
-          X = ( ( Point )_currentColorPosition ).X * e.NewSize.Width,
-          Y = ( ( Point )_currentColorPosition ).Y * e.NewSize.Height
-        };
-
-        UpdateColorShadeSelectorPositionAndCalculateColor( _newPoint, false );
-      }
-    }
-
-    void SpectrumSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
-    {
-      if( (_currentColorPosition != null) && (this.SelectedColor != null) )
-      {
-        CalculateColor( ( Point )_currentColorPosition );
-      }
-    }
-
-    void HexadecimalTextBox_LostFocus( object sender, RoutedEventArgs e )
-    {
-      TextBox textbox = sender as TextBox;
-      SetHexadecimalStringProperty( textbox.Text, true );
-    }
-
-    #endregion //Event Handlers
-
-    #region Events
-
-    public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent( "SelectedColorChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<Color?> ), typeof( ColorCanvas ) );
-    public event RoutedPropertyChangedEventHandler<Color?> SelectedColorChanged
-    {
-      add
-      {
-        AddHandler( SelectedColorChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( SelectedColorChangedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Methods
-
-    private void UpdateSelectedColor()
-    {
-      SelectedColor = Color.FromArgb( A, R, G, B );
-    }
-
-    private void UpdateSelectedColor( Color? color )
-    {
-      SelectedColor = ( ( color != null ) && color.HasValue ) 
-                      ? (Color?)Color.FromArgb( color.Value.A, color.Value.R, color.Value.G, color.Value.B )
-                      : null;
-    }
-
-    private void UpdateRGBValues( Color? color )
-    {
-      if( ( color == null ) || !color.HasValue )
-        return;
-
-      _surpressPropertyChanged = true;
-
-      A = color.Value.A;
-      R = color.Value.R;
-      G = color.Value.G;
-      B = color.Value.B;
-
-      _surpressPropertyChanged = false;
-    }
-
-    private void UpdateColorShadeSelectorPositionAndCalculateColor( Point p, bool calculateColor )
-    {
-      if( (_colorShadingCanvas == null) || ( _colorShadeSelector == null) )
-        return;
-
-        if( p.Y < 0 )
-        p.Y = 0;
-
-      if( p.X < 0 )
-        p.X = 0;
-
-      if( p.X > _colorShadingCanvas.ActualWidth )
-        p.X = _colorShadingCanvas.ActualWidth;
-
-      if( p.Y > _colorShadingCanvas.ActualHeight )
-        p.Y = _colorShadingCanvas.ActualHeight;
-
-      _colorShadeSelectorTransform.X = p.X - ( _colorShadeSelector.Width / 2 );
-      _colorShadeSelectorTransform.Y = p.Y - ( _colorShadeSelector.Height / 2 );
-
-      p.X = p.X / _colorShadingCanvas.ActualWidth;
-      p.Y = p.Y / _colorShadingCanvas.ActualHeight;
-
-      _currentColorPosition = p;
-
-      if( calculateColor )
-        CalculateColor( p );
-    }
-
-    private void UpdateColorShadeSelectorPosition( Color? color )
-    {
-      if( (_spectrumSlider == null) || (_colorShadingCanvas == null) || (color == null) || !color.HasValue)
-        return;
-
-      _currentColorPosition = null;
-
-      var hsv = ColorUtilities.ConvertRgbToHsv( color.Value.R, color.Value.G, color.Value.B );
-
-      if( _updateSpectrumSliderValue )
-      {
-        _spectrumSlider.Value = 360 - hsv.H;
-      }
-
-      Point p = new Point( hsv.S, 1 - hsv.V );
-
-      _currentColorPosition = p;
-
-      _colorShadeSelectorTransform.X = ( p.X * _colorShadingCanvas.Width ) - 5;
-      _colorShadeSelectorTransform.Y = ( p.Y * _colorShadingCanvas.Height ) - 5;
-    }
-
-    private void CalculateColor( Point p )
-    {
-      if( _spectrumSlider == null )
-        return;
-
-      HsvColor hsv = new HsvColor( 360 - _spectrumSlider.Value, 1, 1 )
-      {
-        S = p.X,
-        V = 1 - p.Y
-      };
-      var currentColor = ColorUtilities.ConvertHsvToRgb( hsv.H, hsv.S, hsv.V );
-      currentColor.A = A;
-      _updateSpectrumSliderValue = false;
-      SelectedColor = currentColor;
-      _updateSpectrumSliderValue = true;
-      SetHexadecimalStringProperty( GetFormatedColorString( SelectedColor ), false );
-    }
-
-    private string GetFormatedColorString( Color? colorToFormat )
-    {
-      if( ( colorToFormat == null ) || !colorToFormat.HasValue )
-        return string.Empty;
-      return ColorUtilities.FormatColorString( colorToFormat.ToString(), UsingAlphaChannel );
-    }
-
-    private string GetFormatedColorString( string stringToFormat )
-    {
-      return ColorUtilities.FormatColorString( stringToFormat, UsingAlphaChannel );
-    }
-
-    private void SetHexadecimalStringProperty( string newValue, bool modifyFromUI )
-    {
-      if( modifyFromUI )
-      {
-        try
-        {
-          if( !string.IsNullOrEmpty( newValue ) )
-          {
-            int outValue;
-            // User has entered an hexadecimal value (without the "#" character)... add it.
-            if( Int32.TryParse( newValue, System.Globalization.NumberStyles.HexNumber, null, out outValue ) )
-            {
-              newValue = "#" + newValue;
-            }
-            ColorConverter.ConvertFromString( newValue );
-          }
-          HexadecimalString = newValue;
-        }
-        catch
-        {
-          //When HexadecimalString is changed via UI and hexadecimal format is bad, keep the previous HexadecimalString.
-          SetHexadecimalTextBoxTextProperty( HexadecimalString );
-        }
-      }
-      else
-      {
-        //When HexadecimalString is changed via Code-Behind, hexadecimal format will be evaluated in OnCoerceHexadecimalString()
-        HexadecimalString = newValue;
-      }
-    }
-
-    private void SetHexadecimalTextBoxTextProperty( string newValue )
-    {
-      if( _hexadecimalTextBox != null )
-        _hexadecimalTextBox.Text = newValue;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
deleted file mode 100644
index 8d61bcbb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_SpectrumDisplay, Type = typeof( Rectangle ) )]
-  public class ColorSpectrumSlider : Slider
-  {
-    private const string PART_SpectrumDisplay = "PART_SpectrumDisplay";
-
-    #region Private Members
-
-    private Rectangle _spectrumDisplay;
-    private LinearGradientBrush _pickerBrush;
-
-    #endregion //Private Members
-
-    #region Constructors
-
-    static ColorSpectrumSlider()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorSpectrumSlider ), new FrameworkPropertyMetadata( typeof( ColorSpectrumSlider ) ) );
-    }
-
-    #endregion //Constructors
-
-    #region Dependency Properties
-
-    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorSpectrumSlider ), new PropertyMetadata( System.Windows.Media.Colors.Transparent ) );
-    public Color SelectedColor
-    {
-      get
-      {
-        return ( Color )GetValue( SelectedColorProperty );
-      }
-      set
-      {
-        SetValue( SelectedColorProperty, value );
-      }
-    }
-
-    #endregion //Dependency Properties
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      _spectrumDisplay = ( Rectangle )GetTemplateChild( PART_SpectrumDisplay );
-      CreateSpectrum();
-      OnValueChanged( Double.NaN, Value );
-    }
-
-    protected override void OnValueChanged( double oldValue, double newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-
-      Color color = ColorUtilities.ConvertHsvToRgb( 360 - newValue, 1, 1 );
-      SelectedColor = color;
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Methods
-
-    private void CreateSpectrum()
-    {
-      _pickerBrush = new LinearGradientBrush();
-      _pickerBrush.StartPoint = new Point( 0.5, 0 );
-      _pickerBrush.EndPoint = new Point( 0.5, 1 );
-      _pickerBrush.ColorInterpolationMode = ColorInterpolationMode.SRgbLinearInterpolation;
-
-      var colorsList = ColorUtilities.GenerateHsvSpectrum();
-
-      double stopIncrement = ( double )1 / (colorsList.Count - 1);
-
-      int i;
-      for( i = 0; i < colorsList.Count; i++ )
-      {
-        _pickerBrush.GradientStops.Add( new GradientStop( colorsList[ i ], i * stopIncrement ) );
-      }
-
-      _pickerBrush.GradientStops[ i - 1 ].Offset = 1.0;
-      if( _spectrumDisplay != null )
-      {
-        _spectrumDisplay.Fill = _pickerBrush;
-      }
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 4047e312..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,475 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-
-  <!-- =============================================================================== -->
-  <!-- ColorCanvasTextBox (Style)                                                      -->
-  <!-- =============================================================================== -->
-
-  <Style x:Key="ColorCanvasTextBoxStyle"
-         TargetType="TextBox"
-         BasedOn="{StaticResource {x:Type TextBox}}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Style.Triggers>
-      <Trigger Property="IsFocused"
-               Value="False">
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-
-  <!-- =============================================================================== -->
-  <!-- SliderRepeatButton (Style)                                                      -->
-  <!-- =============================================================================== -->
-
-  <Style x:Key="SliderRepeatButtonStyle"
-         TargetType="{x:Type RepeatButton}">
-    <Setter Property="OverridesDefaultStyle"
-            Value="true" />
-    <Setter Property="IsTabStop"
-            Value="false" />
-    <Setter Property="Focusable"
-            Value="false" />
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Border Background="{TemplateBinding Background}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-
-  <!-- =============================================================================== -->
-  <!-- VerticalSlideThumb (Template and Style)                                         -->
-  <!-- =============================================================================== -->
-
-  <ControlTemplate x:Key="VerticalSlideThumbTemplate"
-                   TargetType="{x:Type Thumb}">
-    <Canvas SnapsToDevicePixels="true">
-      <Path x:Name="LeftArrow"
-            Stretch="Fill"
-            StrokeLineJoin="Round"
-            Stroke="#FF000000"
-            Fill="#FF000000"
-            Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z "
-            RenderTransformOrigin="0.5,0.5"
-            Width="6"
-            Height="8">
-        <Path.RenderTransform>
-          <TransformGroup>
-            <ScaleTransform />
-            <SkewTransform />
-            <RotateTransform />
-            <TranslateTransform Y="6"
-                                X="-3" />
-          </TransformGroup>
-        </Path.RenderTransform>
-      </Path>
-      <Path x:Name="RightArrow"
-            Stretch="Fill"
-            StrokeLineJoin="Round"
-            Stroke="#FF000000"
-            Fill="#FF000000"
-            Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z "
-            RenderTransformOrigin="0.5,0.5"
-            Width="6"
-            Height="8">
-        <Path.RenderTransform>
-          <TransformGroup>
-            <ScaleTransform />
-            <SkewTransform />
-            <RotateTransform Angle="-180" />
-            <TranslateTransform Y="6"
-                                X="8" />
-          </TransformGroup>
-        </Path.RenderTransform>
-      </Path>
-    </Canvas>
-  </ControlTemplate>
-
-  <Style x:Key="VerticalSlideThumbStyle"
-         TargetType="{x:Type Thumb}">
-    <Setter Property="Focusable"
-            Value="false" />
-    <Setter Property="OverridesDefaultStyle"
-            Value="true" />
-    <Setter Property="Height"
-            Value="12" />
-    <Setter Property="Width"
-            Value="11" />
-    <Setter Property="Foreground"
-            Value="Gray" />
-    <Setter Property="Template"
-            Value="{StaticResource VerticalSlideThumbTemplate}" />
-  </Style>
-
-
-  <!-- =============================================================================== -->
-  <!-- ColorSpectrumSlider (Template and Style)                                        -->
-  <!-- =============================================================================== -->
-
-  <ControlTemplate x:Key="ColorSpectrumSliderTemplate"
-                   TargetType="{x:Type local:ColorSpectrumSlider}">
-    <Grid>
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Margin="0,8,0,0">
-        <Border x:Name="PART_TrackBackground"
-                Width="15">
-          <Rectangle x:Name="PART_SpectrumDisplay"
-                     Stretch="Fill"
-                     VerticalAlignment="Stretch" />
-        </Border>
-      </Border>
-
-      <Track Name="PART_Track">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}"
-                        Command="Slider.DecreaseLarge">
-          </RepeatButton>
-        </Track.DecreaseRepeatButton>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}"
-                        Command="Slider.IncreaseLarge">
-          </RepeatButton>
-        </Track.IncreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb Style="{StaticResource VerticalSlideThumbStyle}">
-          </Thumb>
-        </Track.Thumb>
-      </Track>
-    </Grid>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:ColorSpectrumSlider}">
-    <Setter Property="BorderBrush"
-            Value="DarkGray" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Orientation"
-            Value="Vertical" />
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-    <Setter Property="Minimum"
-            Value="0" />
-    <Setter Property="Maximum"
-            Value="360" />
-    <Setter Property="TickFrequency"
-            Value="0.001" />
-    <Setter Property="IsSnapToTickEnabled"
-            Value="True" />
-    <Setter Property="IsDirectionReversed"
-            Value="False" />
-    <Setter Property="IsMoveToPointEnabled"
-            Value="True" />
-    <Setter Property="Value"
-            Value="0" />
-    <Setter Property="Template"
-            Value="{StaticResource ColorSpectrumSliderTemplate}" />
-  </Style>
-
-
-  <!-- =============================================================================== -->
-  <!-- ColorCanvas (Template and Style)                                                -->
-  <!-- =============================================================================== -->
-
-  <ControlTemplate x:Key="ColorCanvasTemplate"
-                   TargetType="{x:Type local:ColorCanvas}">
-    <Border Background="{TemplateBinding Background}"
-            BorderThickness="{TemplateBinding BorderThickness}"
-            BorderBrush="{TemplateBinding BorderBrush}"
-            Padding="3">
-      <Grid Margin="2">
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="200" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-          </Grid.RowDefinitions>
-
-          <Border BorderThickness="1"
-                  BorderBrush="DarkGray"
-                  ClipToBounds="True"
-                  Background="{StaticResource CheckerBrush}">
-            <Canvas x:Name="PART_ColorShadingCanvas"
-                    Width="200"
-                    Height="100"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Top">
-              <Rectangle x:Name="ColorShadingRectangle"
-                         Height="{Binding ElementName=PART_ColorShadingCanvas, Path=Height}"
-                         Width="{Binding ElementName=PART_ColorShadingCanvas, Path=Width}"
-                         Fill="{Binding SelectedColor, ElementName=PART_SpectrumSlider, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-              <Rectangle x:Name="WhiteGradient"
-                         Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}"
-                         Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
-                <Rectangle.Fill>
-                  <LinearGradientBrush StartPoint="0,0"
-                                       EndPoint="1,0">
-                    <GradientStop Offset="0"
-                                  Color="#ffffffff" />
-                    <GradientStop Offset="1"
-                                  Color="Transparent" />
-                  </LinearGradientBrush>
-                </Rectangle.Fill>
-              </Rectangle>
-              <Rectangle x:Name="BlackGradient"
-                         Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}"
-                         Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
-                <Rectangle.Fill>
-                  <LinearGradientBrush StartPoint="0,1"
-                                       EndPoint="0, 0">
-                    <GradientStop Offset="0"
-                                  Color="#ff000000" />
-                    <GradientStop Offset="1"
-                                  Color="#00000000" />
-                  </LinearGradientBrush>
-                </Rectangle.Fill>
-              </Rectangle>
-              <Canvas x:Name="PART_ColorShadeSelector"
-                      Width="10"
-                      Height="10"
-                      IsHitTestVisible="False">
-                <Ellipse Width="10"
-                         Height="10"
-                         StrokeThickness="3"
-                         Stroke="#FFFFFFFF"
-                         IsHitTestVisible="False" />
-                <Ellipse Width="10"
-                         Height="10"
-                         StrokeThickness="1"
-                         Stroke="#FF000000"
-                         IsHitTestVisible="False" />
-              </Canvas>
-            </Canvas>
-          </Border>
-
-          <Border Grid.Row="1"
-                  Margin="0,5,0,0">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-              <Border x:Name="SelectedColorBorder"
-                      Background="{StaticResource CheckerBrush}"
-                      Height="22"
-                      Margin="2,0,2,0"
-                      BorderThickness="1"
-                      BorderBrush="#FFC9CACA">
-                <Rectangle x:Name="SelectedColor"
-                           Fill="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-              </Border>
-              <TextBox x:Name="PART_HexadecimalTextBox"
-                       Grid.Column="1"
-                       Margin="2,0,2,0"
-                       VerticalAlignment="Center"
-                       Style="{StaticResource ColorCanvasTextBoxStyle}">
-              </TextBox>
-            </Grid>
-          </Border>
-
-          <Border Grid.Column="1"
-                  Grid.RowSpan="2"
-                  Margin="4,-8,0,0"
-                  ClipToBounds="False">
-            <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider"
-                                       VerticalAlignment="Stretch">
-            </local:ColorSpectrumSlider>
-          </Border>
-        </Grid>
-
-        <Border x:Name="RGBBorder"
-                MinWidth="180"
-                Grid.Row="1"
-                BorderThickness="1"
-                ClipToBounds="True"
-                Margin="0,10,0,0">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="44" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Grid.Row="0"
-                       Grid.Column="0"
-                       Text="R"
-                       VerticalAlignment="Center">
-            </TextBlock>
-            <Slider x:Name="PART_RSlider"
-                    Maximum="255"
-                    SmallChange="1"
-                    LargeChange="10"
-                    TickFrequency="1"
-                    Grid.Row="0"
-                    Grid.Column="1"
-                    Margin="4,6,4,6"
-                    Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
-                    VerticalAlignment="Center">
-            </Slider>
-            <local:ByteUpDown Grid.Row="0"
-                              Grid.Column="2"
-                              Value="{Binding Value, ElementName=PART_RSlider}"
-                              VerticalAlignment="Center"
-                              Background="Transparent">
-            </local:ByteUpDown>
-
-            <TextBlock Grid.Row="1"
-                       Grid.Column="0"
-                       Text="G"
-                       VerticalAlignment="Center">
-            </TextBlock>
-            <Slider x:Name="PART_GSlider"
-                    Maximum="255"
-                    SmallChange="1"
-                    LargeChange="10"
-                    TickFrequency="1"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Margin="4,6,4,6"
-                    Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
-                    VerticalAlignment="Center">
-            </Slider>
-            <local:ByteUpDown Grid.Row="1"
-                              Grid.Column="2"
-                              Value="{Binding Value, ElementName=PART_GSlider}"
-                              VerticalAlignment="Center"
-                              Background="Transparent">
-            </local:ByteUpDown>
-
-            <TextBlock Grid.Row="2"
-                       Grid.Column="0"
-                       Text="B"
-                       VerticalAlignment="Center">
-            </TextBlock>
-            <Slider x:Name="PART_BSlider"
-                    Maximum="255"
-                    SmallChange="1"
-                    LargeChange="10"
-                    TickFrequency="1"
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Margin="4,6,4,6"
-                    Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
-                    VerticalAlignment="Center">
-            </Slider>
-            <local:ByteUpDown Grid.Row="2"
-                              Grid.Column="3"
-                              Value="{Binding Value, ElementName=PART_BSlider}"
-                              VerticalAlignment="Center"
-                              Background="Transparent">
-            </local:ByteUpDown>
-
-            <TextBlock Grid.Row="3"
-                       Grid.Column="0"
-                       Text="A"
-                       VerticalAlignment="Center"
-                       Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-            </TextBlock>
-            <Slider x:Name="PART_OpacitySlider"
-                    Grid.Row="3"
-                    Grid.Column="1"
-                    Maximum="255"
-                    SmallChange="1"
-                    LargeChange="10"
-                    Margin="4,6,4,6"
-                    Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
-                    VerticalAlignment="Center"
-                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-            </Slider>
-            <local:ByteUpDown Grid.Row="3"
-                              Grid.Column="3"
-                              Value="{Binding Value, ElementName=PART_OpacitySlider}"
-                              VerticalAlignment="Center"
-                              Background="Transparent"
-                              Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-            </local:ByteUpDown>
-          </Grid>
-        </Border>
-      </Grid>
-    </Border>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="Foreground"
-                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-      </Trigger>
-      <Trigger Property="SelectedColor"
-               Value="{x:Null}">
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="PART_ColorShadeSelector" />
-        <Setter Property="Background"
-                Value="Transparent"
-                TargetName="SelectedColorBorder" />
-        <Setter Property="IsEnabled"
-                Value="False"
-                TargetName="RGBBorder" />
-        <Setter Property="TextElement.Foreground"
-                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                TargetName="RGBBorder" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:ColorCanvas}">
-    <Setter Property="Background"
-            Value="{StaticResource PanelBackgroundBrush}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Template"
-            Value="{StaticResource ColorCanvasTemplate}" />
-  </Style>
-
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
deleted file mode 100644
index 2c9d81f4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
+++ /dev/null
@@ -1,616 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Common.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush"
-                       EndPoint="0.5,1"
-                       StartPoint="0.5,0">
-    <GradientStop Color="#FFA3AEB9"
-                  Offset="0" />
-    <GradientStop Color="#FF8399A9"
-                  Offset="0.375" />
-    <GradientStop Color="#FF718597"
-                  Offset="0.375" />
-    <GradientStop Color="#FF617584"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="ColorCanvasBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="HorizontalSliderTrackNormalBackground"
-                   Color="#FFE7EAEA" />
-
-  <LinearGradientBrush x:Key="HorizontalSliderTrackNormalBorder"
-                       EndPoint="0,1"
-                       StartPoint="0,0">
-    <GradientStop Color="#FFAEB1AF"
-                  Offset="0.1" />
-    <GradientStop Color="White"
-                  Offset=".9" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="ThumbStroke"
-                       EndPoint="0.5,1"
-                       StartPoint="0.5,0">
-    <GradientStop Color="#FFA3AEB9"
-                  Offset="0" />
-    <GradientStop Color="#FF8399A9"
-                  Offset="0.375" />
-    <GradientStop Color="#FF718597"
-                  Offset="0.375" />
-    <GradientStop Color="#FF617584"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="ThumbFill"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFfefefe" />
-        <GradientStop Offset="0.5"
-                      Color="#FFeff1f2" />
-        <GradientStop Offset="1"
-                      Color="#FFd0d6db" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="ThumbMouseOver"
-                   Color="#FFE5F2F6" />
-
-  <Style x:Key="ColorCanvasTextBoxStyle"
-         TargetType="TextBox"
-         BasedOn="{StaticResource {x:Type TextBox}}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Style.Triggers>
-      <Trigger Property="IsFocused"
-               Value="False">
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="SliderRepeatButtonStyle"
-         TargetType="{x:Type RepeatButton}">
-    <Setter Property="OverridesDefaultStyle"
-            Value="true" />
-    <Setter Property="IsTabStop"
-            Value="false" />
-    <Setter Property="Focusable"
-            Value="false" />
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Border Background="{TemplateBinding Background}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="CustomThumbForSlider"
-         TargetType="{x:Type Thumb}">
-    <Setter Property="OverridesDefaultStyle"
-            Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Thumb}">
-          <Rectangle x:Name="_thumb"
-                     Fill="{StaticResource ThumbFill}"
-                     Stroke="{StaticResource ThumbStroke}"
-                     Height="14"
-                     Width="8"
-                     RadiusX="1"
-                     RadiusY="1" />
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="_thumb"
-                      Property="Rectangle.Fill"
-                      Value="{StaticResource ThumbMouseOver}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="VerticalSlideThumbStyle"
-         TargetType="{x:Type Thumb}">
-    <Setter Property="Focusable"
-            Value="false" />
-    <Setter Property="OverridesDefaultStyle"
-            Value="true" />
-    <Setter Property="Height"
-            Value="12" />
-    <Setter Property="Width"
-            Value="11" />
-    <Setter Property="Foreground"
-            Value="Gray" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Thumb}">
-          <Canvas SnapsToDevicePixels="true">
-            <Path x:Name="LeftArrow"
-                  Stretch="Fill"
-                  StrokeLineJoin="Round"
-                  Stroke="#FF000000"
-                  Fill="#FF000000"
-                  Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z "
-                  RenderTransformOrigin="0.5,0.5"
-                  Width="6"
-                  Height="8">
-              <Path.RenderTransform>
-                <TransformGroup>
-                  <ScaleTransform />
-                  <SkewTransform />
-                  <RotateTransform />
-                  <TranslateTransform Y="6"
-                                      X="-3" />
-                </TransformGroup>
-              </Path.RenderTransform>
-            </Path>
-            <Path x:Name="RightArrow"
-                  Stretch="Fill"
-                  StrokeLineJoin="Round"
-                  Stroke="#FF000000"
-                  Fill="#FF000000"
-                  Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z "
-                  RenderTransformOrigin="0.5,0.5"
-                  Width="6"
-                  Height="8">
-              <Path.RenderTransform>
-                <TransformGroup>
-                  <ScaleTransform />
-                  <SkewTransform />
-                  <RotateTransform Angle="-180" />
-                  <TranslateTransform Y="6"
-                                      X="8" />
-                </TransformGroup>
-              </Path.RenderTransform>
-            </Path>
-          </Canvas>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ColorCanvasSliderStyle"
-         TargetType="{x:Type Slider}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Slider}">
-          <Border BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Background="{TemplateBinding Background}"
-                  SnapsToDevicePixels="true">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto"
-                               MinHeight="{TemplateBinding MinHeight}" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <TickBar x:Name="TopTick"
-                       Fill="{TemplateBinding Foreground}"
-                       Height="4"
-                       Placement="Top"
-                       Grid.Row="0"
-                       Visibility="Collapsed" />
-              <TickBar x:Name="BottomTick"
-                       Fill="{TemplateBinding Foreground}"
-                       Height="4"
-                       Placement="Bottom"
-                       Grid.Row="2"
-                       Visibility="Collapsed" />
-              <Border x:Name="TrackBackground"
-                      BorderBrush="{StaticResource HorizontalSliderTrackNormalBorder}"
-                      BorderThickness="1"
-                      Background="{StaticResource HorizontalSliderTrackNormalBackground}"
-                      CornerRadius="1"
-                      Height="4.0"
-                      Margin="5,0"
-                      Grid.Row="1"
-                      VerticalAlignment="center">
-                <Canvas Margin="-6,-1">
-                  <Rectangle x:Name="PART_SelectionRange"
-                             Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"
-                             Height="4.0"
-                             Stroke="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
-                             StrokeThickness="1.0"
-                             Visibility="Hidden" />
-                </Canvas>
-              </Border>
-              <Track x:Name="PART_Track"
-                     Grid.Row="1">
-                <Track.DecreaseRepeatButton>
-                  <RepeatButton Command="{x:Static Slider.DecreaseLarge}"
-                                Style="{StaticResource SliderRepeatButtonStyle}" >
-                  </RepeatButton>
-                </Track.DecreaseRepeatButton>
-                <Track.IncreaseRepeatButton>
-                  <RepeatButton Command="{x:Static Slider.IncreaseLarge}"
-                                Style="{StaticResource SliderRepeatButtonStyle}" >
-                  </RepeatButton>
-                </Track.IncreaseRepeatButton>
-                <Track.Thumb>
-                  <Thumb x:Name="Thumb"
-                         Style="{StaticResource CustomThumbForSlider}" >
-                  </Thumb>
-                </Track.Thumb>
-              </Track>
-            </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:ColorCanvas}">
-    <Setter Property="Background"
-            Value="{StaticResource ColorCanvasBackgroundBrush}" />
-    <Setter Property="BorderBrush"
-            Value="{StaticResource ColorPickerDarkBorderBrush}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:ColorCanvas}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  Padding="3">
-            <Grid Margin="2">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="200" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-
-                <Border BorderThickness="1"
-                        BorderBrush="DarkGray"
-                        ClipToBounds="True"
-                        Background="{StaticResource CheckerBrush}">
-                  <Canvas x:Name="PART_ColorShadingCanvas"
-                          Width="200"
-                          Height="100"
-                          HorizontalAlignment="Left"
-                          VerticalAlignment="Top">
-                    <Rectangle x:Name="ColorShadingRectangle"
-                               Height="{Binding ElementName=PART_ColorShadingCanvas, Path=Height}"
-                               Width="{Binding ElementName=PART_ColorShadingCanvas, Path=Width}"
-                               Fill="{Binding SelectedColor, ElementName=PART_SpectrumSlider, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                    <Rectangle x:Name="WhiteGradient"
-                               Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}"
-                               Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
-                      <Rectangle.Fill>
-                        <LinearGradientBrush StartPoint="0,0"
-                                             EndPoint="1,0">
-                          <GradientStop Offset="0"
-                                        Color="#ffffffff" />
-                          <GradientStop Offset="1"
-                                        Color="Transparent" />
-                        </LinearGradientBrush>
-                      </Rectangle.Fill>
-                    </Rectangle>
-                    <Rectangle x:Name="BlackGradient"
-                               Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}"
-                               Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
-                      <Rectangle.Fill>
-                        <LinearGradientBrush StartPoint="0,1"
-                                             EndPoint="0, 0">
-                          <GradientStop Offset="0"
-                                        Color="#ff000000" />
-                          <GradientStop Offset="1"
-                                        Color="#00000000" />
-                        </LinearGradientBrush>
-                      </Rectangle.Fill>
-                    </Rectangle>
-                    <Canvas x:Name="PART_ColorShadeSelector"
-                            Width="10"
-                            Height="10"
-                            IsHitTestVisible="False">
-                      <Ellipse Width="10"
-                               Height="10"
-                               StrokeThickness="3"
-                               Stroke="#FFFFFFFF"
-                               IsHitTestVisible="False" />
-                      <Ellipse Width="10"
-                               Height="10"
-                               StrokeThickness="1"
-                               Stroke="#FF000000"
-                               IsHitTestVisible="False" />
-                    </Canvas>
-                  </Canvas>
-                </Border>
-
-                <Border Grid.Row="1"
-                        Margin="0,5,0,0">
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="*" />
-                      <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Border x:Name="SelectedColorBorder"
-                            Background="{StaticResource CheckerBrush}"
-                            Height="22"
-                            Margin="2,0,2,0"
-                            BorderThickness="1"
-                            BorderBrush="#FFC9CACA">
-                      <Rectangle x:Name="SelectedColor"
-                                 Fill="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                    </Border>
-                    <TextBox x:Name="PART_HexadecimalTextBox"
-                             Grid.Column="1"
-                             Margin="2,0,2,0"
-                             VerticalAlignment="Center"
-                             Style="{StaticResource ColorCanvasTextBoxStyle}" >
-                    </TextBox>
-                  </Grid>
-                </Border>
-
-                <Border Grid.Column="1"
-                        Grid.RowSpan="2"
-                        Margin="4,-8,0,0"
-                        ClipToBounds="False">
-                  <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider"
-                                             VerticalAlignment="Stretch" >
-                  </local:ColorSpectrumSlider>
-                </Border>
-              </Grid>
-
-              <Border x:Name="RGBBorder"
-                      MinWidth="180"
-                      Grid.Row="1"
-                      BorderThickness="1"
-                      ClipToBounds="True"
-                      Margin="0,10,0,0">
-                <Grid>
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="44" />
-                  </Grid.ColumnDefinitions>
-
-                  <TextBlock Grid.Row="0"
-                             Grid.Column="0"
-                             Text="R"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                  <Slider x:Name="PART_RSlider"
-                          Maximum="255"
-                          SmallChange="1"
-                          LargeChange="10"
-                          TickFrequency="1"
-                          Grid.Row="0"
-                          Grid.Column="1"
-                          Margin="4,6,4,6"
-                          Style="{StaticResource ColorCanvasSliderStyle}"
-                          Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
-                          VerticalAlignment="Center" >
-                  </Slider>
-                  <local:ByteUpDown Grid.Row="0"
-                                    Grid.Column="2"
-                                    Value="{Binding Value, ElementName=PART_RSlider}"
-                                    VerticalAlignment="Center"
-                                    Background="Transparent" >
-                  </local:ByteUpDown>
-
-                  <TextBlock Grid.Row="1"
-                             Grid.Column="0"
-                             Text="G"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                  <Slider x:Name="PART_GSlider"
-                          Maximum="255"
-                          SmallChange="1"
-                          LargeChange="10"
-                          TickFrequency="1"
-                          Grid.Row="1"
-                          Grid.Column="1"
-                          Margin="4,6,4,6"
-                          Style="{StaticResource ColorCanvasSliderStyle}"
-                          Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
-                          VerticalAlignment="Center" >
-                  </Slider>
-                  <local:ByteUpDown Grid.Row="1"
-                                    Grid.Column="2"
-                                    Value="{Binding Value, ElementName=PART_GSlider}"
-                                    VerticalAlignment="Center"
-                                    Background="Transparent" >
-                  </local:ByteUpDown>
-
-                  <TextBlock Grid.Row="2"
-                             Grid.Column="0"
-                             Text="B"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                  <Slider x:Name="PART_BSlider"
-                          Maximum="255"
-                          SmallChange="1"
-                          LargeChange="10"
-                          TickFrequency="1"
-                          Grid.Row="2"
-                          Grid.Column="1"
-                          Margin="4,6,4,6"
-                          Style="{StaticResource ColorCanvasSliderStyle}"
-                          Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
-                          VerticalAlignment="Center" >
-                  </Slider>
-                  <local:ByteUpDown Grid.Row="2"
-                                    Grid.Column="3"
-                                    Value="{Binding Value, ElementName=PART_BSlider}"
-                                    VerticalAlignment="Center"
-                                    Background="Transparent" >
-                  </local:ByteUpDown>
-
-                  <TextBlock Grid.Row="3"
-                             Grid.Column="0"
-                             Text="A"
-                             VerticalAlignment="Center"
-                             Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                  </TextBlock>
-                  <Slider x:Name="PART_OpacitySlider"
-                          Grid.Row="3"
-                          Grid.Column="1"
-                          Maximum="255"
-                          SmallChange="1"
-                          LargeChange="10"
-                          Margin="4,6,4,6"
-                          Style="{StaticResource ColorCanvasSliderStyle}"
-                          Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
-                          VerticalAlignment="Center"
-                          Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                  </Slider>
-                  <local:ByteUpDown Grid.Row="3"
-                                    Grid.Column="3"
-                                    Value="{Binding Value, ElementName=PART_OpacitySlider}"
-                                    VerticalAlignment="Center"
-                                    Background="Transparent"
-                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                  </local:ByteUpDown>
-                </Grid>
-              </Border>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="SelectedColor"
-                     Value="{x:Null}">
-              <Setter Property="Visibility"
-                      Value="Collapsed"
-                      TargetName="PART_ColorShadeSelector" />
-              <Setter Property="Background"
-                      Value="Transparent"
-                      TargetName="SelectedColorBorder" />
-              <Setter Property="IsEnabled"
-                      Value="False"
-                      TargetName="RGBBorder" />
-              <Setter Property="TextElement.Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                      TargetName="RGBBorder" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:ColorSpectrumSlider}">
-    <Setter Property="BorderBrush"
-            Value="DarkGray" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Orientation"
-            Value="Vertical" />
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-    <Setter Property="Minimum"
-            Value="0" />
-    <Setter Property="Maximum"
-            Value="360" />
-    <Setter Property="TickFrequency"
-            Value="0.001" />
-    <Setter Property="IsSnapToTickEnabled"
-            Value="True" />
-    <Setter Property="IsDirectionReversed"
-            Value="False" />
-    <Setter Property="IsMoveToPointEnabled"
-            Value="True" />
-    <Setter Property="Value"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}">
-          <Grid>
-            <Border BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Margin="0,8,0,0">
-              <Border x:Name="PART_TrackBackground"
-                      Width="15">
-                <Rectangle x:Name="PART_SpectrumDisplay"
-                           Stretch="Fill"
-                           VerticalAlignment="Stretch" />
-              </Border>
-            </Border>
-
-            <Track Name="PART_Track">
-              <Track.DecreaseRepeatButton>
-                <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}"
-                              Command="Slider.DecreaseLarge" />
-              </Track.DecreaseRepeatButton>
-              <Track.IncreaseRepeatButton>
-                <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}"
-                              Command="Slider.IncreaseLarge" />
-              </Track.IncreaseRepeatButton>
-              <Track.Thumb>
-                <Thumb Style="{StaticResource VerticalSlideThumbStyle}" />
-              </Track.Thumb>
-            </Track>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
deleted file mode 100644
index 883ef47e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ColorItem
-  {
-    public Color? Color
-    {
-      get;
-      set;
-    }
-    public string Name
-    {
-      get;
-      set;
-    }
-
-    public ColorItem( Color? color, string name )
-    {
-      Color = color;
-      Name = name;
-    }
-
-    public override bool Equals(object obj)
-    {
-      var ci = obj as ColorItem;
-      if (ci == null)
-          return false;
-      return ( ci.Color.Equals( Color ) && ci.Name.Equals( Name ) );
-    }
-
-    public override int GetHashCode()
-    {
-      return this.Color.GetHashCode() ^ this.Name.GetHashCode();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
deleted file mode 100644
index 23c0a469..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
+++ /dev/null
@@ -1,806 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.ObjectModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum ColorMode
-  {
-    ColorPalette,
-    ColorCanvas
-  }
-
-  public enum ColorSortingMode
-  {
-    Alphabetical,
-    HueSaturationBrightness
-  }
-
-  [TemplatePart( Name = PART_AvailableColors, Type = typeof( ListBox ) )]
-  [TemplatePart( Name = PART_StandardColors, Type = typeof( ListBox ) )]
-  [TemplatePart( Name = PART_RecentColors, Type = typeof( ListBox ) )]
-  [TemplatePart( Name = PART_ColorPickerToggleButton, Type = typeof( ToggleButton ) )]
-  [TemplatePart( Name = PART_ColorPickerPalettePopup, Type = typeof( Popup ) )]
-  public class ColorPicker : Control
-  {
-    private const string PART_AvailableColors = "PART_AvailableColors";
-    private const string PART_StandardColors = "PART_StandardColors";
-    private const string PART_RecentColors = "PART_RecentColors";
-    private const string PART_ColorPickerToggleButton = "PART_ColorPickerToggleButton";
-    private const string PART_ColorPickerPalettePopup = "PART_ColorPickerPalettePopup";
-
-    #region Members
-
-    private ListBox _availableColors;
-    private ListBox _standardColors;
-    private ListBox _recentColors;
-    private ToggleButton _toggleButton;
-    private Popup _popup;
-    private Color? _initialColor;
-    private bool _selectionChanged;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region AdvancedButtonHeader
-
-    public static readonly DependencyProperty AdvancedButtonHeaderProperty = DependencyProperty.Register( "AdvancedButtonHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Advanced" ) );
-    public string AdvancedButtonHeader
-    {
-      get
-      {
-        return ( string )GetValue( AdvancedButtonHeaderProperty );
-      }
-      set
-      {
-        SetValue( AdvancedButtonHeaderProperty, value );
-      }
-    }
-
-    #endregion //AdvancedButtonHeader
-
-    #region AvailableColors
-
-    public static readonly DependencyProperty AvailableColorsProperty = DependencyProperty.Register( "AvailableColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( CreateAvailableColors() ) );
-    public ObservableCollection<ColorItem> AvailableColors
-    {
-      get
-      {
-        return ( ObservableCollection<ColorItem> )GetValue( AvailableColorsProperty );
-      }
-      set
-      {
-        SetValue( AvailableColorsProperty, value );
-      }
-    }
-
-    #endregion //AvailableColors
-
-    #region AvailableColorsSortingMode
-
-    public static readonly DependencyProperty AvailableColorsSortingModeProperty = DependencyProperty.Register( "AvailableColorsSortingMode", typeof( ColorSortingMode ), typeof( ColorPicker ), new UIPropertyMetadata( ColorSortingMode.Alphabetical, OnAvailableColorsSortingModeChanged ) );
-    public ColorSortingMode AvailableColorsSortingMode
-    {
-      get
-      {
-        return ( ColorSortingMode )GetValue( AvailableColorsSortingModeProperty );
-      }
-      set
-      {
-        SetValue( AvailableColorsSortingModeProperty, value );
-      }
-    }
-
-    private static void OnAvailableColorsSortingModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ColorPicker colorPicker = ( ColorPicker )d;
-      if( colorPicker != null )
-        colorPicker.OnAvailableColorsSortingModeChanged( ( ColorSortingMode )e.OldValue, ( ColorSortingMode )e.NewValue );
-    }
-
-    private void OnAvailableColorsSortingModeChanged( ColorSortingMode oldValue, ColorSortingMode newValue )
-    {
-      ListCollectionView lcv = ( ListCollectionView )( CollectionViewSource.GetDefaultView( this.AvailableColors ) );
-      if( lcv != null )
-      {
-        lcv.CustomSort = ( AvailableColorsSortingMode == ColorSortingMode.HueSaturationBrightness )
-                          ? new ColorSorter()
-                          : null;
-      }
-    }
-
-    #endregion //AvailableColorsSortingMode
-
-    #region AvailableColorsHeader
-
-    public static readonly DependencyProperty AvailableColorsHeaderProperty = DependencyProperty.Register( "AvailableColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Available Colors" ) );
-    public string AvailableColorsHeader
-    {
-      get
-      {
-        return ( string )GetValue( AvailableColorsHeaderProperty );
-      }
-      set
-      {
-        SetValue( AvailableColorsHeaderProperty, value );
-      }
-    }
-
-    #endregion //AvailableColorsHeader
-
-    #region ButtonStyle
-
-    public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register( "ButtonStyle", typeof( Style ), typeof( ColorPicker ) );
-    public Style ButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( ButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( ButtonStyleProperty, value );
-      }
-    }
-
-    #endregion //ButtonStyle
-
-    #region DisplayColorAndName
-
-    public static readonly DependencyProperty DisplayColorAndNameProperty = DependencyProperty.Register( "DisplayColorAndName", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
-    public bool DisplayColorAndName
-    {
-      get
-      {
-        return ( bool )GetValue( DisplayColorAndNameProperty );
-      }
-      set
-      {
-        SetValue( DisplayColorAndNameProperty, value );
-      }
-    }
-
-    #endregion //DisplayColorAndName
-
-    #region DisplayColorTooltip
-
-    public static readonly DependencyProperty DisplayColorTooltipProperty = DependencyProperty.Register( "DisplayColorTooltip", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
-    public bool DisplayColorTooltip
-    {
-      get
-      {
-        return ( bool )GetValue( DisplayColorTooltipProperty );
-      }
-      set
-      {
-        SetValue( DisplayColorTooltipProperty, value );
-      }
-    }
-
-    #endregion //DisplayColorTooltip
-
-    #region ColorMode
-
-    public static readonly DependencyProperty ColorModeProperty = DependencyProperty.Register( "ColorMode", typeof( ColorMode ), typeof( ColorPicker ), new UIPropertyMetadata( ColorMode.ColorPalette ) );
-    public ColorMode ColorMode
-    {
-      get
-      {
-        return ( ColorMode )GetValue( ColorModeProperty );
-      }
-      set
-      {
-        SetValue( ColorModeProperty, value );
-      }
-    }
-
-    #endregion //ColorMode
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ColorPicker colorPicker = (ColorPicker)d;
-      if( colorPicker != null )
-        colorPicker.OnIsOpenChanged( (bool)e.OldValue, (bool)e.NewValue );
-    }
-
-    private void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-      {
-        _initialColor = this.SelectedColor;
-      }
-      RoutedEventArgs args = new RoutedEventArgs( newValue ? OpenedEvent : ClosedEvent, this );
-      this.RaiseEvent( args );
-    }
-
-    #endregion //IsOpen
-
-    #region MaxDropDownWidth
-
-    public static readonly DependencyProperty MaxDropDownWidthProperty = DependencyProperty.Register( "MaxDropDownWidth", typeof( double )
-      , typeof( ColorPicker ), new UIPropertyMetadata( 214d ) );
-    public double MaxDropDownWidth
-    {
-      get
-      {
-        return ( double )GetValue( MaxDropDownWidthProperty );
-      }
-      set
-      {
-        SetValue( MaxDropDownWidthProperty, value );
-      }
-    }
-
-    private static void OnMaxDropDownWidthChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var colorPicker = o as ColorPicker;
-      if( colorPicker != null )
-        colorPicker.OnMaxDropDownWidthChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    protected virtual void OnMaxDropDownWidthChanged( double oldValue, double newValue )
-    {
-
-    }
-
-    #endregion
-
-    #region RecentColors
-
-    public static readonly DependencyProperty RecentColorsProperty = DependencyProperty.Register( "RecentColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( null ) );
-    public ObservableCollection<ColorItem> RecentColors
-    {
-      get
-      {
-        return ( ObservableCollection<ColorItem> )GetValue( RecentColorsProperty );
-      }
-      set
-      {
-        SetValue( RecentColorsProperty, value );
-      }
-    }
-
-    #endregion //RecentColors
-
-    #region RecentColorsHeader
-
-    public static readonly DependencyProperty RecentColorsHeaderProperty = DependencyProperty.Register( "RecentColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Recent Colors" ) );
-    public string RecentColorsHeader
-    {
-      get
-      {
-        return ( string )GetValue( RecentColorsHeaderProperty );
-      }
-      set
-      {
-        SetValue( RecentColorsHeaderProperty, value );
-      }
-    }
-
-    #endregion //RecentColorsHeader
-
-    #region SelectedColor
-
-    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color? ), typeof( ColorPicker ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnSelectedColorPropertyChanged ) ) );
-    public Color? SelectedColor
-    {
-      get
-      {
-        return ( Color? )GetValue( SelectedColorProperty );
-      }
-      set
-      {
-        SetValue( SelectedColorProperty, value );
-      }
-    }
-
-    private static void OnSelectedColorPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ColorPicker colorPicker = ( ColorPicker )d;
-      if( colorPicker != null )
-        colorPicker.OnSelectedColorChanged( ( Color? )e.OldValue, ( Color? )e.NewValue );
-    }
-
-    private void OnSelectedColorChanged( Color? oldValue, Color? newValue )
-    {
-      SelectedColorText = GetFormatedColorString( newValue );
-
-      RoutedPropertyChangedEventArgs<Color?> args = new RoutedPropertyChangedEventArgs<Color?>( oldValue, newValue );
-      args.RoutedEvent = ColorPicker.SelectedColorChangedEvent;
-      RaiseEvent( args );
-    }
-
-    #endregion //SelectedColor
-
-    #region SelectedColorText
-
-    public static readonly DependencyProperty SelectedColorTextProperty = DependencyProperty.Register( "SelectedColorText", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "" ) );
-    public string SelectedColorText
-    {
-      get
-      {
-        return ( string )GetValue( SelectedColorTextProperty );
-      }
-      protected set
-      {
-        SetValue( SelectedColorTextProperty, value );
-      }
-    }
-
-    #endregion //SelectedColorText
-
-    #region ShowTabHeaders
-
-    public static readonly DependencyProperty ShowTabHeadersProperty = DependencyProperty.Register( "ShowTabHeaders", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
-    public bool ShowTabHeaders
-    {
-      get
-      {
-        return ( bool )GetValue( ShowTabHeadersProperty );
-      }
-      set
-      {
-        SetValue( ShowTabHeadersProperty, value );
-      }
-    }
-
-    #endregion //ShowTabHeaders
-
-    #region ShowAvailableColors
-
-    public static readonly DependencyProperty ShowAvailableColorsProperty = DependencyProperty.Register( "ShowAvailableColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
-    public bool ShowAvailableColors
-    {
-      get
-      {
-        return ( bool )GetValue( ShowAvailableColorsProperty );
-      }
-      set
-      {
-        SetValue( ShowAvailableColorsProperty, value );
-      }
-    }
-
-    #endregion //ShowAvailableColors
-
-    #region ShowRecentColors
-
-    public static readonly DependencyProperty ShowRecentColorsProperty = DependencyProperty.Register( "ShowRecentColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
-    public bool ShowRecentColors
-    {
-      get
-      {
-        return ( bool )GetValue( ShowRecentColorsProperty );
-      }
-      set
-      {
-        SetValue( ShowRecentColorsProperty, value );
-      }
-    }
-
-    #endregion //DisplayRecentColors
-
-    #region ShowStandardColors
-
-    public static readonly DependencyProperty ShowStandardColorsProperty = DependencyProperty.Register( "ShowStandardColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
-    public bool ShowStandardColors
-    {
-      get
-      {
-        return ( bool )GetValue( ShowStandardColorsProperty );
-      }
-      set
-      {
-        SetValue( ShowStandardColorsProperty, value );
-      }
-    }
-
-    #endregion //DisplayStandardColors
-
-    #region ShowDropDownButton
-
-    public static readonly DependencyProperty ShowDropDownButtonProperty = DependencyProperty.Register( "ShowDropDownButton", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
-    public bool ShowDropDownButton
-    {
-      get
-      {
-        return ( bool )GetValue( ShowDropDownButtonProperty );
-      }
-      set
-      {
-        SetValue( ShowDropDownButtonProperty, value );
-      }
-    }
-
-    #endregion //ShowDropDownButton
-
-    #region StandardButtonHeader
-
-    public static readonly DependencyProperty StandardButtonHeaderProperty = DependencyProperty.Register( "StandardButtonHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Standard" ) );
-    public string StandardButtonHeader
-    {
-      get
-      {
-        return ( string )GetValue( StandardButtonHeaderProperty );
-      }
-      set
-      {
-        SetValue( StandardButtonHeaderProperty, value );
-      }
-    }
-
-    #endregion //StandardButtonHeader
-
-    #region StandardColors
-
-    public static readonly DependencyProperty StandardColorsProperty = DependencyProperty.Register( "StandardColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( CreateStandardColors() ) );
-    public ObservableCollection<ColorItem> StandardColors
-    {
-      get
-      {
-        return ( ObservableCollection<ColorItem> )GetValue( StandardColorsProperty );
-      }
-      set
-      {
-        SetValue( StandardColorsProperty, value );
-      }
-    }
-
-    #endregion //StandardColors
-
-    #region StandardColorsHeader
-
-    public static readonly DependencyProperty StandardColorsHeaderProperty = DependencyProperty.Register( "StandardColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Standard Colors" ) );
-    public string StandardColorsHeader
-    {
-      get
-      {
-        return ( string )GetValue( StandardColorsHeaderProperty );
-      }
-      set
-      {
-        SetValue( StandardColorsHeaderProperty, value );
-      }
-    }
-
-    #endregion //StandardColorsHeader
-
-    #region UsingAlphaChannel
-
-    public static readonly DependencyProperty UsingAlphaChannelProperty = DependencyProperty.Register( "UsingAlphaChannel", typeof( bool ), typeof( ColorPicker ), new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnUsingAlphaChannelPropertyChanged ) ) );
-    public bool UsingAlphaChannel
-    {
-      get
-      {
-        return ( bool )GetValue( UsingAlphaChannelProperty );
-      }
-      set
-      {
-        SetValue( UsingAlphaChannelProperty, value );
-      }
-    }
-
-    private static void OnUsingAlphaChannelPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ColorPicker colorPicker = ( ColorPicker )d;
-      if( colorPicker != null )
-        colorPicker.OnUsingAlphaChannelChanged();
-    }
-
-    private void OnUsingAlphaChannelChanged()
-    {
-      SelectedColorText = GetFormatedColorString( SelectedColor );
-    }
-
-    #endregion //UsingAlphaChannel
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static ColorPicker()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorPicker ), new FrameworkPropertyMetadata( typeof( ColorPicker ) ) );
-    }
-
-    public ColorPicker()
-    {
-
-#if VS2008
-        this.RecentColors = new ObservableCollection<ColorItem>();
-#else
-      this.SetCurrentValue( ColorPicker.RecentColorsProperty, new ObservableCollection<ColorItem>() );
-#endif
-
-      Keyboard.AddKeyDownHandler( this, OnKeyDown );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _availableColors != null )
-        _availableColors.SelectionChanged -= Color_SelectionChanged;
-
-      _availableColors = GetTemplateChild( PART_AvailableColors ) as ListBox;
-      if( _availableColors != null )
-        _availableColors.SelectionChanged += Color_SelectionChanged;
-
-      if( _standardColors != null )
-        _standardColors.SelectionChanged -= Color_SelectionChanged;
-
-      _standardColors = GetTemplateChild( PART_StandardColors ) as ListBox;
-      if( _standardColors != null )
-        _standardColors.SelectionChanged += Color_SelectionChanged;
-
-      if( _recentColors != null )
-        _recentColors.SelectionChanged -= Color_SelectionChanged;
-
-      _recentColors = GetTemplateChild( PART_RecentColors ) as ListBox;
-      if( _recentColors != null )
-        _recentColors.SelectionChanged += Color_SelectionChanged;
-
-      if( _popup != null )
-        _popup.Opened -= Popup_Opened;
-
-      _popup = GetTemplateChild( PART_ColorPickerPalettePopup ) as Popup;
-      if( _popup != null )
-        _popup.Opened += Popup_Opened;
-
-      _toggleButton = this.Template.FindName( PART_ColorPickerToggleButton, this ) as ToggleButton;
-    }
-
-    protected override void OnMouseUp( MouseButtonEventArgs e )
-    {
-      base.OnMouseUp( e );
-
-      // Close ColorPicker on MouseUp to prevent action of MouseUp on controls behind the ColorPicker.
-      if( _selectionChanged )
-      {
-        CloseColorPicker( true );
-        _selectionChanged = false;
-      }
-    }
-
-
-#endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void OnKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsOpen = true;
-          // Focus will be on ListBoxItem in Popup_Opened().
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          CloseColorPicker( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Escape )
-        {
-          this.SelectedColor = _initialColor;
-          CloseColorPicker( true );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      CloseColorPicker( true );
-    }
-
-    private void Color_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ListBox lb = ( ListBox )sender;
-
-      if( e.AddedItems.Count > 0 )
-      {
-        var colorItem = ( ColorItem )e.AddedItems[ 0 ];
-        SelectedColor = colorItem.Color;
-        if( !string.IsNullOrEmpty( colorItem.Name ) )
-        {
-          this.SelectedColorText = colorItem.Name;
-        }
-        UpdateRecentColors( colorItem );
-        _selectionChanged = true;
-        lb.SelectedIndex = -1; //for now I don't care about keeping track of the selected color
-      }
-    }
-
-    private void Popup_Opened( object sender, EventArgs e )
-    {
-      if( ( _availableColors != null ) && ShowAvailableColors )
-      {
-        FocusOnListBoxItem( _availableColors );
-      }
-      else if( ( _standardColors != null ) && ShowStandardColors )
-        FocusOnListBoxItem( _standardColors );
-      else if( ( _recentColors != null ) && ShowRecentColors )
-        FocusOnListBoxItem( _recentColors );
-    }
-
-    private void FocusOnListBoxItem( ListBox listBox )
-    {
-      ListBoxItem listBoxItem = ( ListBoxItem )listBox.ItemContainerGenerator.ContainerFromItem( listBox.SelectedItem );
-      if( ( listBoxItem == null ) && ( listBox.Items.Count > 0 ) )
-        listBoxItem = ( ListBoxItem )listBox.ItemContainerGenerator.ContainerFromItem( listBox.Items[ 0 ] );
-      if( listBoxItem != null )
-        listBoxItem.Focus();
-    }
-
-    #endregion //Event Handlers
-
-    #region Events
-
-    #region SelectedColorChangedEvent
-
-    public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent( "SelectedColorChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<Color?> ), typeof( ColorPicker ) );
-    public event RoutedPropertyChangedEventHandler<Color?> SelectedColorChanged
-    {
-      add
-      {
-        AddHandler( SelectedColorChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( SelectedColorChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region OpenedEvent
-
-    public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent( "OpenedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( ColorPicker ) );
-    public event RoutedEventHandler Opened
-    {
-      add
-      {
-        AddHandler( OpenedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( OpenedEvent, value );
-      }
-    }
-
-    #endregion //OpenedEvent
-
-    #region ClosedEvent
-
-    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent( "ClosedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( ColorPicker ) );
-    public event RoutedEventHandler Closed
-    {
-      add
-      {
-        AddHandler( ClosedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ClosedEvent, value );
-      }
-    }
-
-    #endregion //ClosedEvent
-
-    #endregion //Events
-
-    #region Methods
-
-    private void CloseColorPicker( bool isFocusOnColorPicker )
-    {
-      if( IsOpen )
-        IsOpen = false;
-      ReleaseMouseCapture();
-
-      if( isFocusOnColorPicker && ( _toggleButton != null) )
-        _toggleButton.Focus();
-      this.UpdateRecentColors( new ColorItem( SelectedColor, SelectedColorText ) );
-    }
-
-    private void UpdateRecentColors( ColorItem colorItem )
-    {
-      if( !RecentColors.Contains( colorItem ) )
-        RecentColors.Add( colorItem );
-
-      if( RecentColors.Count > 10 ) //don't allow more than ten, maybe make a property that can be set by the user.
-        RecentColors.RemoveAt( 0 );
-    }
-
-    private string GetFormatedColorString( Color? colorToFormat )
-    {
-      if( ( colorToFormat == null ) || !colorToFormat.HasValue )
-        return string.Empty;
-
-      return ColorUtilities.FormatColorString( colorToFormat.Value.GetColorName(), UsingAlphaChannel );
-    }
-
-    private static ObservableCollection<ColorItem> CreateStandardColors()
-    {
-      ObservableCollection<ColorItem> standardColors = new ObservableCollection<ColorItem>();
-      standardColors.Add( new ColorItem( Colors.Transparent, "Transparent" ) );
-      standardColors.Add( new ColorItem( Colors.White, "White" ) );
-      standardColors.Add( new ColorItem( Colors.Gray, "Gray" ) );
-      standardColors.Add( new ColorItem( Colors.Black, "Black" ) );
-      standardColors.Add( new ColorItem( Colors.Red, "Red" ) );
-      standardColors.Add( new ColorItem( Colors.Green, "Green" ) );
-      standardColors.Add( new ColorItem( Colors.Blue, "Blue" ) );
-      standardColors.Add( new ColorItem( Colors.Yellow, "Yellow" ) );
-      standardColors.Add( new ColorItem( Colors.Orange, "Orange" ) );
-      standardColors.Add( new ColorItem( Colors.Purple, "Purple" ) );
-      return standardColors;
-    }
-
-    private static ObservableCollection<ColorItem> CreateAvailableColors()
-    {
-      ObservableCollection<ColorItem> standardColors = new ObservableCollection<ColorItem>();
-
-      foreach( var item in ColorUtilities.KnownColors )
-      {
-        if( !String.Equals( item.Key, "Transparent" ) )
-        {
-          var colorItem = new ColorItem( item.Value, item.Key );
-          if( !standardColors.Contains( colorItem ) )
-            standardColors.Add( colorItem );
-        }
-      }
-
-      return standardColors;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
deleted file mode 100644
index 370263a6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ColorPickerTabItem : TabItem
-  {
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( e.Source == this || !this.IsSelected )
-        return;
-
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      //Selection on Mouse Up
-      if( e.Source == this || !this.IsSelected )
-      {
-        base.OnMouseLeftButtonDown( e );
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
deleted file mode 100644
index 30fa8ec5..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class ColorSorter : IComparer
-  {
-    public int Compare( object firstItem, object secondItem )
-    {
-      if( firstItem == null || secondItem == null )
-        return -1;
-
-      ColorItem colorItem1 = ( ColorItem )firstItem;
-      ColorItem colorItem2 = ( ColorItem )secondItem;
-
-      if( (colorItem1.Color == null) || !colorItem1.Color.HasValue || 
-          (colorItem2.Color == null) || !colorItem2.Color.HasValue )
-        return -1;
-
-      System.Drawing.Color drawingColor1 = System.Drawing.Color.FromArgb( colorItem1.Color.Value.A, colorItem1.Color.Value.R, colorItem1.Color.Value.G, colorItem1.Color.Value.B );
-      System.Drawing.Color drawingColor2 = System.Drawing.Color.FromArgb( colorItem2.Color.Value.A, colorItem2.Color.Value.R, colorItem2.Color.Value.G, colorItem2.Color.Value.B );
-
-      // Compare Hue
-      double hueColor1 = Math.Round( ( double )drawingColor1.GetHue(), 3 );
-      double hueColor2 = Math.Round( ( double )drawingColor2.GetHue(), 3 );
-
-      if( hueColor1 > hueColor2 )
-        return 1;
-      else if( hueColor1 < hueColor2 )
-        return -1;
-      else
-      {
-        // Hue is equal, compare Saturation
-        double satColor1 = Math.Round( ( double )drawingColor1.GetSaturation(), 3 );
-        double satColor2 = Math.Round( ( double )drawingColor2.GetSaturation(), 3 );
-
-        if( satColor1 > satColor2 )
-          return 1;
-        else if( satColor1 < satColor2 )
-          return -1;
-        else
-        {
-          // Saturation is equal, compare Brightness
-          double brightColor1 = Math.Round( ( double )drawingColor1.GetBrightness(), 3 );
-          double brightColor2 = Math.Round( ( double )drawingColor2.GetBrightness(), 3 );
-
-          if( brightColor1 > brightColor2 )
-            return 1;
-          else if( brightColor1 < brightColor2 )
-            return -1;
-        }
-      }
-
-      return 0;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index ca5926c0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,502 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-  <conv:AdditionConverter x:Key="AdditionConverter" />
-  <conv:ColorModeToTabItemSelectedConverter x:Key="ColorModeToTabItemSelectedConverter" />
-
-  <Style x:Key="ColorItemContainerStyle"
-         TargetType="{x:Type ListBoxItem}">
-    <Setter Property="ToolTip"
-            Value="{Binding Name}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ListBoxItem}">
-          <Grid x:Name="mainGrid"
-                ToolTip="{Binding Name}">
-            <Grid.Resources>
-              <Style TargetType="ToolTip">
-                <Style.Triggers>
-                  <Trigger Property="Content"
-                           Value="{x:Static sys:String.Empty}">
-                    <Setter Property="Visibility"
-                            Value="Collapsed" />
-                  </Trigger>
-                </Style.Triggers>
-              </Style>
-            </Grid.Resources>
-            <ContentPresenter HorizontalAlignment="Center"
-                              VerticalAlignment="Center" />
-            <Border BorderThickness="1"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    x:Name="_outerBorder"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch">
-              <Border Background="Transparent"
-                      BorderThickness="1"
-                      BorderBrush="Transparent"
-                      x:Name="_innerBorder"
-                      HorizontalAlignment="Stretch"
-                      VerticalAlignment="Stretch" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="_outerBorder"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-              <Setter TargetName="_innerBorder"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-            </Trigger>
-            <Trigger Property="IsSelected"
-                     Value="True">
-              <Setter TargetName="_outerBorder"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-              <Setter TargetName="_innerBorder"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-            </Trigger>
-            <DataTrigger Binding="{Binding DisplayColorTooltip, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}}"
-                         Value="False">
-              <Setter Property="ToolTip"
-                      Value="{x:Static sys:String.Empty}"
-                      TargetName="mainGrid" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <DataTemplate x:Key="ColorItemTemplate">
-    <Grid>
-      <Border Background="{StaticResource CheckerBrush}"
-              BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}"
-              BorderThickness="1"
-              Margin="2,2,2,2">
-        <Rectangle Width="14"
-                   Height="14">
-          <Rectangle.Style>
-            <Style TargetType="Rectangle">
-              <Setter Property="Fill"
-                      Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-            </Style>
-          </Rectangle.Style>
-        </Rectangle>
-      </Border>
-    </Grid>
-  </DataTemplate>
-
-  <Style x:Key="ColorPickerToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-
-              <Border Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Padding="{TemplateBinding Padding}"
-                      SnapsToDevicePixels="True">
-                <ContentPresenter Content="{TemplateBinding Content}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-              </Border>
-
-              <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                   Grid.Column="1"
-                                   CornerRadius="0"
-                                   Visibility="{Binding ShowDropDownButton, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                   RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-                                   RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-                                   RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                   RenderPressed="{TemplateBinding IsPressed}">
-
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ColorDisplayStyle"
-         TargetType="ContentControl">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="ContentTemplate">
-      <Setter.Value>
-        <DataTemplate>
-          <Border Background="{StaticResource CheckerBrush}">
-            <Rectangle Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-          </Border>
-        </DataTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-                   Value="{x:Null}">
-        <Setter Property="Visibility"
-                Value="Collapsed" />
-      </DataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="ColorListStyle"
-         TargetType="ListBox">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="MaxHeight"
-            Value="500" />
-    <Setter Property="ItemsPanel">
-      <Setter.Value>
-        <ItemsPanelTemplate>
-          <!-- ConverterParameter is margin/Padding from Popup-->
-          <WrapPanel Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
-        </ItemsPanelTemplate>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="ItemContainerStyle"
-            Value="{StaticResource ColorItemContainerStyle}" />
-    <Setter Property="ItemTemplate"
-            Value="{StaticResource ColorItemTemplate}" />
-    <Setter Property="SelectionMode"
-            Value="Single" />
-  </Style>
-
-  <ControlTemplate x:Key="TabItemTemplate"
-                   TargetType="{x:Type local:ColorPickerTabItem}">
-    <Grid x:Name="templateRoot"
-          SnapsToDevicePixels="true">
-      <Border x:Name="mainBorder"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="1,1,1,0"
-              Background="#FFF0F0F0"
-              Margin="0">
-        <Border x:Name="innerBorder"
-                BorderBrush="#ACACAC"
-                BorderThickness="1,1,1,0"
-                Background="#FFF0F0F0"
-                Margin="-1"
-                Opacity="0" />
-      </Border>
-      <ContentPresenter x:Name="contentPresenter"
-                        ContentSource="Header"
-                        Focusable="False"
-                        HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                        Margin="{TemplateBinding Padding}"
-                        RecognizesAccessKey="True"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}"
-                     Value="true" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Panel.ZIndex"
-                Value="1" />
-        <Setter Property="Margin"
-                Value="-2,-2,-2,0" />
-        <Setter Property="Opacity"
-                TargetName="innerBorder"
-                Value="1" />
-      </MultiDataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-
-  <!-- =============================================================================== -->
-  <!-- ColorPicker                                                                     -->
-  <!-- =============================================================================== -->
-
-  <Style x:Key="ColorPicker"
-         TargetType="{x:Type local:ColorPicker}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="ButtonStyle"
-            Value="{StaticResource ColorPickerToggleButtonStyle}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="MaxDropDownWidth"
-            Value="218" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:ColorPicker}">
-          <Grid>
-            <ToggleButton x:Name="PART_ColorPickerToggleButton"
-                          IsTabStop="True"
-                          MinHeight="22"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          Padding="{TemplateBinding Padding}"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          Style="{TemplateBinding ButtonStyle}">
-              <Grid Margin="2">
-                <ContentControl x:Name="ColorOnly"
-                                Style="{StaticResource ColorDisplayStyle}" />
-
-                <Border x:Name="ColorAndName"
-                        Background="White"
-                        Visibility="Hidden">
-                  <StackPanel Orientation="Horizontal">
-                    <ContentControl HorizontalAlignment="Left"
-                                    Width="20"
-                                    Margin="2,1,4,1"
-                                    Style="{StaticResource ColorDisplayStyle}"
-                                    BorderThickness="1"
-                                    BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-                    <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}"
-                               VerticalAlignment="Center">
-                    </TextBlock>
-                  </StackPanel>
-                </Border>
-              </Grid>
-            </ToggleButton>
-
-            <Popup x:Name="PART_ColorPickerPalettePopup"
-                   VerticalAlignment="Bottom"
-                   IsOpen="{Binding ElementName=PART_ColorPickerToggleButton, Path=IsChecked}"
-                   StaysOpen="False"
-                   AllowsTransparency="True"
-                   Focusable="False"
-                   HorizontalOffset="1"
-                   VerticalOffset="1"
-                   PopupAnimation="Slide"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{StaticResource PanelBackgroundBrush}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                      Padding="3">
-                <TabControl x:Name="ColorPickerTabControl"
-                            Background="Transparent"
-                            SelectedIndex="{Binding ColorMode, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorModeToTabItemSelectedConverter}}">
-                  <local:ColorPickerTabItem x:Name="StandardTabItem"
-                                            Header="{Binding StandardButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Template="{StaticResource TabItemTemplate}">
-                    <Grid x:Name="_colorPaletteHost"
-                          Margin="4">
-                      <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                      </Grid.RowDefinitions>
-
-                      <!-- Available Colors -->
-                      <Grid Grid.Row="1"
-                            Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Grid>
-                          <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition />
-                          </Grid.RowDefinitions>
-                          <TextBlock Text="{TemplateBinding AvailableColorsHeader}"
-                                     Background="AliceBlue"
-                                     Padding="2"
-                                     Margin="0,0,0,1">
-                          </TextBlock>
-                          <ListBox x:Name="PART_AvailableColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}">
-                          </ListBox>
-                        </Grid>
-                      </Grid>
-
-                      <!-- Standard Colors-->
-                      <Grid Grid.Row="2"
-                            Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Grid>
-                          <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                          </Grid.RowDefinitions>
-                          <TextBlock Text="{TemplateBinding StandardColorsHeader}"
-                                     Background="AliceBlue"
-                                     Padding="2"
-                                     Margin="0,1,0,1">
-                          </TextBlock>
-                          <ListBox x:Name="PART_StandardColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}">
-                          </ListBox>
-                        </Grid>
-                      </Grid>
-
-                      <!-- Recent Colors-->
-                      <Grid Grid.Row="3"
-                            Margin="0,1,0,1"
-                            Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Grid>
-                          <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="22" />
-                          </Grid.RowDefinitions>
-                          <TextBlock Text="{TemplateBinding RecentColorsHeader}"
-                                     Background="AliceBlue"
-                                     Padding="2"
-                                     Margin="0,1,0,1">
-                          </TextBlock>
-                          <ListBox x:Name="PART_RecentColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}">
-                          </ListBox>
-                        </Grid>
-                      </Grid>
-                    </Grid>
-                  </local:ColorPickerTabItem>
-                  <local:ColorPickerTabItem x:Name="AdvancedTabItem"
-                                            Header="{Binding AdvancedButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Template="{StaticResource TabItemTemplate}">
-                    <!-- ColorCanvas -->
-                    <Grid x:Name="_colorCanvasHost">
-                      <local:ColorCanvas Background="Transparent"
-                                         BorderThickness="0"
-                                         UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}"
-                                         Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
-                    </Grid>
-                  </local:ColorPickerTabItem>
-                </TabControl>
-              </Border>
-            </Popup>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="DisplayColorAndName"
-                     Value="True">
-              <Setter TargetName="ColorOnly"
-                      Property="Visibility"
-                      Value="Collapsed" />
-              <Setter TargetName="ColorAndName"
-                      Property="Visibility"
-                      Value="Visible" />
-            </Trigger>
-
-            <Trigger Property="ShowTabHeaders"
-                     Value="False">
-              <Setter Property="Visibility"
-                      Value="Collapsed"
-                      TargetName="StandardTabItem" />
-              <Setter Property="Visibility"
-                      Value="Collapsed"
-                      TargetName="AdvancedTabItem" />
-            </Trigger>
-
-            <Trigger Property="ShowDropDownButton"
-                     Value="False">
-              <Setter Property="BorderThickness"
-                      Value="1" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver"
-               Value="True">
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-      </Trigger>
-      <Trigger Property="IsKeyboardFocusWithin"
-               Value="True">
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type local:ColorPicker}"
-         BasedOn="{StaticResource ColorPicker}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
deleted file mode 100644
index aa31e288..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
+++ /dev/null
@@ -1,521 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Common.xaml" />
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <SolidColorBrush x:Key="ButtonHover"
-                   Color="#C2E0FF" />
-  <SolidColorBrush x:Key="ButtonHoverBorder"
-                   Color="#3399FF" />
-  <SolidColorBrush x:Key="ButtonChecked"
-                   Color="#E6F0FA" />
-  <SolidColorBrush x:Key="ButtonPressed"
-                   Color="#99CCFF" />
-  <SolidColorBrush x:Key="ButtonPressedBorder"
-                   Color="#3399FF" />
-
-  <!-- =============================================================================== -->
-  <!-- ColorPicker                                                                     -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-  <conv:AdditionConverter x:Key="AdditionConverter" />
-  <conv:ColorModeToTabItemSelectedConverter x:Key="ColorModeToTabItemSelectedConverter" />
-
-  <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush"
-                       EndPoint="0.5,1"
-                       StartPoint="0.5,0">
-    <GradientStop Color="#FFA3AEB9"
-                  Offset="0" />
-    <GradientStop Color="#FF8399A9"
-                  Offset="0.375" />
-    <GradientStop Color="#FF718597"
-                  Offset="0.375" />
-    <GradientStop Color="#FF617584"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <Style x:Key="ColorItemContainerStyle"
-         TargetType="{x:Type ListBoxItem}">
-    <Setter Property="ToolTip"
-            Value="{Binding Name}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ListBoxItem}">
-          <Grid x:Name="mainGrid"
-                ToolTip="{Binding Name}">
-            <Grid.Resources>
-              <Style TargetType="ToolTip">
-                <Style.Triggers>
-                  <Trigger Property="Content"
-                           Value="{x:Static sys:String.Empty}">
-                    <Setter Property="Visibility"
-                            Value="Collapsed" />
-                  </Trigger>
-                </Style.Triggers>
-              </Style>
-            </Grid.Resources>
-            <ContentPresenter HorizontalAlignment="Center"
-                              VerticalAlignment="Center" />
-            <Border BorderThickness="1"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    x:Name="_outerBorder"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch">
-              <Border Background="Transparent"
-                      BorderThickness="1"
-                      BorderBrush="Transparent"
-                      x:Name="_innerBorder"
-                      HorizontalAlignment="Stretch"
-                      VerticalAlignment="Stretch" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="_outerBorder"
-                      Property="BorderBrush"
-                      Value="#FFFF0000" />
-              <Setter TargetName="_innerBorder"
-                      Property="BorderBrush"
-                      Value="#FFFFFF00" />
-            </Trigger>
-            <Trigger Property="IsSelected"
-                     Value="True">
-              <Setter TargetName="_outerBorder"
-                      Property="BorderBrush"
-                      Value="#FFFF0000" />
-              <Setter TargetName="_innerBorder"
-                      Property="BorderBrush"
-                      Value="#FFFFFF00" />
-            </Trigger>
-            <DataTrigger Binding="{Binding DisplayColorTooltip, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}}"
-                         Value="False">
-              <Setter Property="ToolTip"
-                      Value="{x:Static sys:String.Empty}"
-                      TargetName="mainGrid" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <DataTemplate x:Key="ColorItemTemplate">
-    <Grid>
-      <Border Background="{StaticResource CheckerBrush}"
-              BorderBrush="Black"
-              BorderThickness="1"
-              Margin="2,2,2,2">
-        <Rectangle Width="14"
-                   Height="14">
-          <Rectangle.Style>
-            <Style TargetType="Rectangle">
-              <Setter Property="Fill"
-                      Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-            </Style>
-          </Rectangle.Style>
-        </Rectangle>
-      </Border>
-    </Grid>
-  </DataTemplate>
-
-  <Style x:Key="ColorPickerToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-
-              <Border Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Padding="{TemplateBinding Padding}"
-                      SnapsToDevicePixels="True">
-                <ContentPresenter Content="{TemplateBinding Content}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-              </Border>
-
-              <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                   Grid.Column="1"
-                                   CornerRadius="0,2.75,2.75,0"
-                                   Visibility="{Binding ShowDropDownButton, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                   RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-                                   RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-                                   RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                   RenderPressed="{TemplateBinding IsPressed}">
-
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ColorDisplayStyle"
-         TargetType="ContentControl">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="ContentTemplate">
-      <Setter.Value>
-        <DataTemplate>
-          <Border Background="{StaticResource CheckerBrush}">
-            <Rectangle Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-          </Border>
-        </DataTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-                   Value="{x:Null}">
-        <Setter Property="Visibility"
-                Value="Collapsed" />
-      </DataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="ColorListStyle"
-         TargetType="ListBox">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="MaxHeight"
-            Value="500" />
-    <Setter Property="ItemsPanel">
-      <Setter.Value>
-        <ItemsPanelTemplate>
-          <!-- ConverterParameter is margin/Padding from Popup-->
-          <WrapPanel Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
-        </ItemsPanelTemplate>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="ItemContainerStyle"
-            Value="{StaticResource ColorItemContainerStyle}" />
-    <Setter Property="ItemTemplate"
-            Value="{StaticResource ColorItemTemplate}" />
-    <Setter Property="SelectionMode"
-            Value="Single" />
-  </Style>
-
-  <ControlTemplate x:Key="TabItemTemplate"
-                   TargetType="{x:Type local:ColorPickerTabItem}">
-    <Grid x:Name="templateRoot"
-          SnapsToDevicePixels="true">
-      <Border x:Name="mainBorder"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="1,1,1,0"
-              Background="#FFF0F0F0"
-              Margin="0">
-        <Border x:Name="innerBorder"
-                BorderBrush="#ACACAC"
-                BorderThickness="1,1,1,0"
-                Background="#FFF0F0F0"
-                Margin="-1"
-                Opacity="0" />
-      </Border>
-      <ContentPresenter x:Name="contentPresenter"
-                        ContentSource="Header"
-                        Focusable="False"
-                        HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                        Margin="{TemplateBinding Padding}"
-                        RecognizesAccessKey="True"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}"
-                     Value="true" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Panel.ZIndex"
-                Value="1" />
-        <Setter Property="Margin"
-                Value="-2,-2,-2,0" />
-        <Setter Property="Opacity"
-                TargetName="innerBorder"
-                Value="1" />
-      </MultiDataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:ColorPicker}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderBrush"
-            Value="{StaticResource ColorPickerDarkBorderBrush}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="ButtonStyle"
-            Value="{StaticResource ColorPickerToggleButtonStyle}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="MaxDropDownWidth"
-            Value="218" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:ColorPicker}">
-          <Grid>
-            <ToggleButton x:Name="PART_ColorPickerToggleButton"
-                          IsTabStop="True"
-                          MinHeight="22"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          Padding="{TemplateBinding Padding}"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          Style="{TemplateBinding ButtonStyle}">
-              <Grid Margin="2">
-                <ContentControl x:Name="ColorOnly"
-                                Style="{StaticResource ColorDisplayStyle}" />
-
-                <Border x:Name="ColorAndName"
-                        Background="White"
-                        Visibility="Hidden">
-                  <StackPanel Orientation="Horizontal">
-                    <ContentControl HorizontalAlignment="Left"
-                                    Width="20"
-                                    Margin="2,1,4,1"
-                                    Style="{StaticResource ColorDisplayStyle}"
-                                    BorderThickness="1"
-                                    BorderBrush="#FFC9CACA" />
-                    <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}"
-                               VerticalAlignment="Center" >
-                    </TextBlock>
-                  </StackPanel>
-                </Border>
-              </Grid>
-            </ToggleButton>
-
-            <Popup x:Name="PART_ColorPickerPalettePopup"
-                   VerticalAlignment="Bottom"
-                   IsOpen="{Binding ElementName=PART_ColorPickerToggleButton, Path=IsChecked}"
-                   StaysOpen="False"
-                   AllowsTransparency="True"
-                   Focusable="False"
-                   HorizontalOffset="1"
-                   VerticalOffset="1"
-                   PopupAnimation="Slide"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{StaticResource PopupBackgroundBrush}"
-                      BorderBrush="{StaticResource ColorPickerDarkBorderBrush}"
-                      Padding="3">
-                <TabControl x:Name="ColorPickerTabControl"
-                            Background="Transparent"
-                            SelectedIndex="{Binding ColorMode, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorModeToTabItemSelectedConverter}}">
-                  <local:ColorPickerTabItem x:Name="StandardTabItem"
-                                            Header="{Binding StandardButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Template="{StaticResource TabItemTemplate}">
-                    <Grid x:Name="_colorPaletteHost"
-                          Margin="4">
-                      <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                      </Grid.RowDefinitions>
-
-                      <!-- Available Colors -->
-                      <Grid Grid.Row="1"
-                            Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Grid>
-                          <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition />
-                          </Grid.RowDefinitions>
-                          <TextBlock Text="{TemplateBinding AvailableColorsHeader}"
-                                     Background="AliceBlue"
-                                     Padding="2"
-                                     Margin="0,0,0,1" >
-                          </TextBlock>
-                          <ListBox x:Name="PART_AvailableColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}" >
-                          </ListBox>
-                        </Grid>
-                      </Grid>
-
-                      <!-- Standard Colors-->
-                      <Grid Grid.Row="2"
-                            Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Grid>
-                          <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                          </Grid.RowDefinitions>
-                          <TextBlock Text="{TemplateBinding StandardColorsHeader}"
-                                     Background="AliceBlue"
-                                     Padding="2"
-                                     Margin="0,1,0,1" >
-                          </TextBlock>
-                          <ListBox x:Name="PART_StandardColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}" >
-                          </ListBox>
-                        </Grid>
-                      </Grid>
-
-                      <!-- Recent Colors-->
-                      <Grid Grid.Row="3"
-                            Margin="0,1,0,1"
-                            Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Grid>
-                          <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="22" />
-                          </Grid.RowDefinitions>
-                          <TextBlock Text="{TemplateBinding RecentColorsHeader}"
-                                     Background="AliceBlue"
-                                     Padding="2"
-                                     Margin="0,1,0,1" >
-                          </TextBlock>
-                          <ListBox x:Name="PART_RecentColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}" >
-                          </ListBox>
-                        </Grid>
-                      </Grid>
-                    </Grid>
-                  </local:ColorPickerTabItem>
-                  <local:ColorPickerTabItem x:Name="AdvancedTabItem"
-                                            Header="{Binding AdvancedButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Template="{StaticResource TabItemTemplate}">
-                    <!-- ColorCanvas -->
-                    <Grid x:Name="_colorCanvasHost">
-                      <local:ColorCanvas Background="Transparent"
-                                         BorderThickness="0"
-                                         UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}"
-                                         Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
-                    </Grid>
-                  </local:ColorPickerTabItem>
-                </TabControl>
-              </Border>
-            </Popup>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="DisplayColorAndName"
-                     Value="True">
-              <Setter TargetName="ColorOnly"
-                      Property="Visibility"
-                      Value="Collapsed" />
-              <Setter TargetName="ColorAndName"
-                      Property="Visibility"
-                      Value="Visible" />
-            </Trigger>
-
-            <Trigger Property="ShowTabHeaders"
-                     Value="False">
-              <Setter Property="Visibility"
-                      Value="Collapsed"
-                      TargetName="StandardTabItem" />
-              <Setter Property="Visibility"
-                      Value="Collapsed"
-                      TargetName="AdvancedTabItem" />
-            </Trigger>
-
-            <Trigger Property="ShowDropDownButton"
-                     Value="False">
-              <Setter Property="BorderThickness"
-                      Value="1" />
-            </Trigger>
-
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
deleted file mode 100644
index d58c61e5..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public delegate void CancelRoutedEventHandler( object sender, CancelRoutedEventArgs e );
-
-  /// <summary>
-  /// An event data class that allows to inform the sender that the handler wants to cancel
-  /// the ongoing action.
-  /// 
-  /// The handler can set the "Cancel" property to false to cancel the action.
-  /// </summary>
-  public class CancelRoutedEventArgs : RoutedEventArgs
-  {
-    public CancelRoutedEventArgs()
-      : base()
-    {
-    }
-
-    public CancelRoutedEventArgs( RoutedEvent routedEvent )
-      : base( routedEvent )
-    {
-    }
-
-    public CancelRoutedEventArgs( RoutedEvent routedEvent, object source )
-      : base( routedEvent, source )
-    {
-    }
-
-    #region Cancel Property
-
-    public bool Cancel
-    {
-      get;
-      set;
-    }
-
-    #endregion Cancel Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
deleted file mode 100644
index dcd4f140..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class AdditionConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( value != null ) && ( parameter != null ) )
-      {
-        var firstValue = ( double )value;
-        var secondValue = double.Parse( parameter as string );
-
-        return firstValue + secondValue;
-      }
-
-      return 0d;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
deleted file mode 100644
index cda549e1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class BorderThicknessToStrokeThicknessConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      Thickness thickness = ( Thickness )value;
-      return ( thickness.Bottom + thickness.Left + thickness.Right + thickness.Top ) / 4;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      int? thick = ( int? )value;
-      int thickValue = thick.HasValue ? thick.Value : 0;
-
-      return new Thickness( thickValue, thickValue, thickValue, thickValue );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
deleted file mode 100644
index 5d8ff375..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class CalculatorMemoryToVisibilityConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return ( decimal )value == decimal.Zero ? Visibility.Hidden : Visibility.Visible;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
deleted file mode 100644
index e1711fe9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-    public class CenterTitleConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            // Parameters: DesiredSize, WindowWidth, HeaderColumns
-            double titleTextWidth = ((Size)values[0]).Width;
-            double windowWidth = (double)values[1];
-
-            ColumnDefinitionCollection headerColumns = (ColumnDefinitionCollection)values[2];
-            double titleColWidth = headerColumns[2].ActualWidth;
-            double buttonsColWidth = headerColumns[3].ActualWidth;
-
-
-            // Result (1) Title is Centered across all HeaderColumns
-            if ((titleTextWidth + buttonsColWidth * 2) < windowWidth)
-                return 1;
-
-            // Result (2) Title is Centered in HeaderColumns[2]
-            if (titleTextWidth < titleColWidth)
-                return 2;
-
-            // Result (3) Title is Left-Aligned in HeaderColumns[2]
-            return 3;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
deleted file mode 100644
index b40f1574..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  /// <summary>
-  /// This converter allow to blend two colors into one based on a specified ratio
-  /// </summary>
-  public class ColorBlendConverter : IValueConverter
-  {
-    private double _blendedColorRatio = 0;
-
-    /// <summary>
-    /// The ratio of the blended color. Must be between 0 and 1.
-    /// </summary>
-    public double BlendedColorRatio
-    {
-      get { return _blendedColorRatio; }
-
-      set
-      {
-        if( value < 0d || value > 1d )
-          throw new ArgumentException( "BlendedColorRatio must be greater than or equal to 0 and lower than or equal to 1 " );
-
-        _blendedColorRatio = value;
-      }
-    }
-
-    /// <summary>
-    /// The color to blend with the source color
-    /// </summary>
-    public Color BlendedColor { get; set; }
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value == null || value.GetType() != typeof( Color ) )
-        return null;
-
-      Color color = ( Color )value;
-      return new Color()
-      {
-        A = this.BlendValue( color.A, this.BlendedColor.A ),
-        R = this.BlendValue( color.R, this.BlendedColor.R ),
-        G = this.BlendValue( color.G, this.BlendedColor.G ),
-        B = this.BlendValue( color.B, this.BlendedColor.B )
-      };
-    }
-
-    private byte BlendValue( byte original, byte blend )
-    {
-      double blendRatio = this.BlendedColorRatio;
-      double sourceRatio = 1 - blendRatio;
-
-      double result = ( ( ( double )original ) * sourceRatio ) + ( ( ( double )blend ) * blendRatio );
-      result = Math.Round( result );
-      result = Math.Min( 255d, Math.Max( 0d, result ) );
-      return System.Convert.ToByte( result );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
deleted file mode 100644
index dced284a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class ColorModeToTabItemSelectedConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      var colorMode = ( ColorMode )value;
-      return (colorMode == ColorMode.ColorPalette) ? 0 : 1;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      var index = ( int )value;
-      return ( index == 0 ) ? ColorMode.ColorPalette : ColorMode.ColorCanvas;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
deleted file mode 100644
index efe72b02..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class ColorToSolidColorBrushConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    /// <summary>
-    /// Converts a Color to a SolidColorBrush.
-    /// </summary>
-    /// <param name="value">The Color produced by the binding source.</param>
-    /// <param name="targetType">The type of the binding target property.</param>
-    /// <param name="parameter">The converter parameter to use.</param>
-    /// <param name="culture">The culture to use in the converter.</param>
-    /// <returns>
-    /// A converted SolidColorBrush. If the method returns null, the valid null value is used.
-    /// </returns>
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value != null )
-        return new SolidColorBrush( ( Color )value );
-
-      return value;
-    }
-
-
-    /// <summary>
-    /// Converts a SolidColorBrush to a Color.
-    /// </summary>
-    /// <remarks>Currently not used in toolkit, but provided for developer use in their own projects</remarks>
-    /// <param name="value">The SolidColorBrush that is produced by the binding target.</param>
-    /// <param name="targetType">The type to convert to.</param>
-    /// <param name="parameter">The converter parameter to use.</param>
-    /// <param name="culture">The culture to use in the converter.</param>
-    /// <returns>
-    /// A converted value. If the method returns null, the valid null value is used.
-    /// </returns>
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value != null )
-        return ( ( SolidColorBrush )value ).Color;
-
-      return value;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
deleted file mode 100644
index 1eb772bc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-    public class CornerRadiusToDoubleConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double radius = 0.0;
-
-            if (value != null)
-                radius = ((CornerRadius)value).TopLeft;
-
-            return radius;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double radius = 0.0;
-
-            if (value != null)
-                radius = (double)value;
-
-            return new CornerRadius(radius);
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
deleted file mode 100644
index 390da4cd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class HalfConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      double size = ( double )value;
-      double modifier = (parameter != null) ? double.Parse( ( string )parameter ) : 0d;
-      if( modifier != 0 )
-        return Math.Max(0, size - modifier) / 2;
-
-      return ( size / 2 );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
deleted file mode 100644
index 8a906ad9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-    public class IntToThicknessConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            int thickValue = 0;
-            if (value != null)
-                thickValue = (int)value;
-
-            if (parameter != null)
-            {
-                if (parameter.ToString().ToUpper() == "LEFT")
-                    return new Thickness(thickValue, 0, 0, 0);
-            }
-
-            return new Thickness(thickValue);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
deleted file mode 100644
index 56a6d0c2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class InverseBoolConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return !( bool )value;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
deleted file mode 100644
index 75650e12..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class NullToBoolConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return (value == null);
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
deleted file mode 100644
index d059569e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class ObjectTypeToNameConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value != null )
-      {
-        if( value is Type )
-        {
-          var displayNameAttribute = ( ( Type )value ).GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
-          return ( displayNameAttribute != null ) ? displayNameAttribute.DisplayName : ( ( Type )value ).Name;
-        }
-
-        var type = value.GetType();
-        var valueString = value.ToString();
-        if( string.IsNullOrEmpty( valueString )
-         || ( valueString == type.UnderlyingSystemType.ToString() ) )
-        {
-          var displayNameAttribute = type.GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
-          return ( displayNameAttribute != null ) ? displayNameAttribute.DisplayName : type.Name;
-        }
-
-        return value; 
-      }
-      return null;
-    }
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
deleted file mode 100644
index ed3c07f8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class RoundedValueConverter : IValueConverter
-  {
-    #region Precision Property
-
-    public int Precision
-    {
-      get
-      {
-        return _precision;
-      }
-      set
-      {
-        _precision = value;
-      }
-    }
-
-    private int _precision = 0;
-
-    #endregion
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is double )
-      {
-        return Math.Round( ( double )value, _precision );
-      }
-      else if( value is Point )
-      {
-        return new Point( Math.Round( ( ( Point )value ).X, _precision ), Math.Round( ( ( Point )value ).Y, _precision ) );
-      }
-      else
-      {
-        return value;
-      }
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return value;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
deleted file mode 100644
index 86cc37b8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class SolidColorBrushToColorConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      SolidColorBrush brush = value as SolidColorBrush;
-      if( brush != null )
-        return brush.Color;
-
-      return default( Color? );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value != null )
-      {
-        Color color = ( Color )value;
-        return new SolidColorBrush( color );
-      }
-
-      return default( SolidColorBrush );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
deleted file mode 100644
index fdcefa48..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class ThicknessSideRemovalConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      var thickness = (Thickness)value;
-      var sideToRemove = int.Parse( (string)parameter );
-      switch( sideToRemove )
-      {
-        case 0: thickness.Left = 0d; break;
-        case 1: thickness.Top = 0d; break;
-        case 2: thickness.Right = 0d; break;
-        case 3: thickness.Bottom = 0d; break;
-        default: throw new InvalidContentException("parameter should be from 0 to 3 to specify the side to remove.");
-      }
-      return thickness;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
deleted file mode 100644
index f78807d0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-    public class ThicknessToDoubleConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double thickness = 1.0;
-
-            if (value != null)
-                thickness = ((Thickness)value).Top;
-
-            return thickness;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double thickness = 1.0;
-
-            if (value != null)
-                thickness = (double)value;
-
-            return new Thickness(thickness);
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
deleted file mode 100644
index e535f3b0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class VisibilityToBoolConverter : IValueConverter
-  {
-    #region Inverted Property
-
-    public bool Inverted
-    {
-      get
-      {
-        return _inverted;
-      }
-      set
-      {
-        _inverted = value;
-      }
-    }
-
-    private bool _inverted; //false
-
-    #endregion
-
-    #region Not Property
-
-    public bool Not
-    {
-      get
-      {
-        return _not;
-      }
-      set
-      {
-        _not = value;
-      }
-    }
-
-    private bool _not; //false
-
-    #endregion
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return this.Inverted ? this.BoolToVisibility( value ) : this.VisibilityToBool( value );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return this.Inverted ? this.VisibilityToBool( value ) : this.BoolToVisibility( value );
-    }
-
-    private object VisibilityToBool( object value )
-    {
-      if( !( value is Visibility ) )
-        throw new InvalidOperationException( ErrorMessages.GetMessage( "SuppliedValueWasNotVisibility" ) );
-
-      return ( ( ( Visibility )value ) == Visibility.Visible ) ^ Not;
-    }
-
-    private object BoolToVisibility( object value )
-    {
-      if( !( value is bool ) )
-        throw new InvalidOperationException( ErrorMessages.GetMessage( "SuppliedValueWasNotBool" ) );
-
-      return ( ( bool )value ^ Not ) ? Visibility.Visible : Visibility.Collapsed;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
deleted file mode 100644
index e09d4cff..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  /// <summary>
-  /// Sets the margin for the thumb grip, the top buttons, or for the content border in the WindowControl.
-  /// </summary>
-  public class WindowContentBorderMarginConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    {
-      double horizontalContentBorderOffset = ( double )values[ 0 ];
-      double verticalContentBorderOffset = ( double )values[ 1 ];
-
-      switch( ( string )parameter )
-      {
-        // Content Border Margin in the WindowControl
-        case "0":
-          return new Thickness( horizontalContentBorderOffset
-                              , 0d
-                              , horizontalContentBorderOffset
-                              , verticalContentBorderOffset );
-        // Thumb Grip Margin in the WindowControl
-        case "1":
-          return new Thickness( 0d
-                              , 0d
-                              , horizontalContentBorderOffset
-                              , verticalContentBorderOffset );
-        // Header Buttons Margin in the WindowControl
-        case "2":
-          return new Thickness( 0d
-                              , 0d
-                              , horizontalContentBorderOffset
-                              , 0d );
-        default:
-          throw new NotSupportedException( "'parameter' for WindowContentBorderMarginConverter is not valid." );
-      }
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
deleted file mode 100644
index 1135f2f3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class WindowControlBackgroundConverter : IMultiValueConverter
-  {
-    /// <summary>
-    /// Used in the WindowContainer Template to calculate the resulting background brush
-    /// from the WindowBackground (values[0]) and WindowOpacity (values[1]) propreties.
-    /// </summary>
-    /// <param name="values"></param>
-    /// <param name="targetType"></param>
-    /// <param name="parameter"></param>
-    /// <param name="culture"></param>
-    /// <returns></returns>
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    {
-      Brush backgroundColor = ( Brush )values[ 0 ];
-      double opacity = ( double )values[ 1 ];
-
-      if( backgroundColor != null )
-      {
-        // Do not override any possible opacity value specifically set by the user.
-        // Only use WindowOpacity value if the user did not set an opacity first.
-        if( backgroundColor.ReadLocalValue( Brush.OpacityProperty ) == System.Windows.DependencyProperty.UnsetValue )
-        {
-          backgroundColor = backgroundColor.Clone();
-          backgroundColor.Opacity = opacity;
-        }
-      }
-      return backgroundColor;
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
deleted file mode 100644
index bfec6ea8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class WizardPageButtonVisibilityConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( values == null || values.Length != 2 )
-        throw new ArgumentException( "Wrong number of arguments for WizardPageButtonVisibilityConverter." );
-
-      Visibility wizardVisibility = ( (values[ 0 ] == null) || (values[ 0 ] == DependencyProperty.UnsetValue) )
-                                    ? Visibility.Hidden
-                                    : ( Visibility )values[ 0 ];
-
-      WizardPageButtonVisibility wizardPageVisibility = ( (values[ 1 ] == null) || (values[ 1 ] == DependencyProperty.UnsetValue) )
-                                                        ? WizardPageButtonVisibility.Hidden
-                                                        : ( WizardPageButtonVisibility )values[ 1 ];
-
-      Visibility visibility = Visibility.Visible;
-
-      switch( wizardPageVisibility )
-      {
-        case WizardPageButtonVisibility.Inherit:
-          visibility = wizardVisibility;
-          break;
-        case WizardPageButtonVisibility.Collapsed:
-          visibility = Visibility.Collapsed;
-          break;
-        case WizardPageButtonVisibility.Hidden:
-          visibility = Visibility.Hidden;
-          break;
-        case WizardPageButtonVisibility.Visible:
-          visibility = Visibility.Visible;
-          break;
-      }
-
-      return visibility;
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
deleted file mode 100644
index ae3aaceb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class EditableKeyValuePair<TKey, TValue> : CustomTypeDescriptor
-  {
-    #region Members
-
-    private PropertyDescriptorCollection _properties;
-
-    #endregion
-
-    #region Properties
-
-    public TKey Key
-    {
-      get;
-      set;
-    }
-
-    public TValue Value
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region Constructors
-
-    //Necessary for adding new items in CollectionEditor
-    public EditableKeyValuePair()
-    {
-      var propertyList = new List<PropertyDescriptor>();
-
-      var KeyDescriptor = TypeDescriptor.CreateProperty( this.GetType(), "Key", typeof( TKey ) );
-      propertyList.Add( KeyDescriptor );
-
-      var ValueDescriptor = TypeDescriptor.CreateProperty( this.GetType(), "Value", typeof( TValue ) );
-      propertyList.Add( ValueDescriptor );
-
-      _properties = new PropertyDescriptorCollection( propertyList.ToArray() );
-    }
-
-    public EditableKeyValuePair( TKey key, TValue value )
-      : this()
-    {
-      this.Key = key;
-      this.Value = value;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    public override PropertyDescriptorCollection GetProperties( Attribute[] attributes )
-    {
-      return this.GetProperties();
-    }
-
-    public override PropertyDescriptorCollection GetProperties()
-    {
-      return _properties;
-    }
-
-    public override object GetPropertyOwner( PropertyDescriptor pd )
-    {
-      return this;
-    }
-
-    public override string ToString()
-    {
-      return "[" + this.Key + "," + this.Value + "]";
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
deleted file mode 100644
index c44e86f9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Resources;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  internal static class ErrorMessages
-  {
-    #region Static Fields
-
-
-    public const string EndAngleCannotBeSetDirectlyInSlice = "EndAngleCannotBeSetDirectlyInSlice";
-    public const string SliceCannotBeSetDirectlyInEndAngle = "SliceCannotBeSetDirectlyInEndAngle";
-    public const string SliceOOR = "SliceOOR";
-    public const string AnimationAccelerationRatioOOR = "AnimationAccelerationRatioOOR";
-    public const string AnimationDecelerationRatioOOR = "AnimationDecelerationRatioOOR";
-    public const string ZoomboxContentMustBeUIElement = "ZoomboxContentMustBeUIElement";
-    public const string ViewModeInvalidForSource = "ViewModeInvalidForSource";
-    public const string ZoomboxTemplateNeedsContent = "ZoomboxTemplateNeedsContent";
-    public const string ZoomboxHasViewFinderButNotDisplay = "ZoomboxHasViewFinderButNotDisplay";
-    public const string PositionOnlyAccessibleOnAbsolute = "PositionOnlyAccessibleOnAbsolute";
-    public const string ZoomboxViewAlreadyInitialized = "ZoomboxViewAlreadyInitialized";
-    public const string ScaleOnlyAccessibleOnAbsolute = "ScaleOnlyAccessibleOnAbsolute";
-    public const string RegionOnlyAccessibleOnRegionalView = "RegionOnlyAccessibleOnRegionalView";
-    public const string UnableToConvertToZoomboxView = "UnableToConvertToZoomboxView";
-    public const string ViewStackCannotBeManipulatedNow = "ViewStackCannotBeManipulatedNow";
-
-
-    public const string SuppliedValueWasNotVisibility = "SuppliedValueWasNotVisibility";
-    public const string NegativeTimeSpanNotSupported = "NegativeTimeSpanNotSupported";
-    public const string NegativeSpeedNotSupported = "NegativeSpeedNotSupported";
-    public const string InvalidRatePropertyAccessed = "InvalidRatePropertyAccessed";
-
-    public const string AlreadyInColumnCollection = "Value already belongs to another 'ColumnDefinitionCollection'.";
-    public const string AlreadyInRowCollection = "Value already belongs to another 'RowDefinitionCollection'.";
-    public const string AlreadyInStackDefinition = "Value already belongs to another 'StackDefinitionCollection'.";
-    public const string ArrayDestTooShort = "'array' destination not long enough.";
-    public const string CollectionDisposed = "Collection was disposed, enumerator operations not valid.";
-    public const string CollectionModified = "Collection was modified; enumeration operation may not execute.";
-    public const string ColumnValueIsReadOnly = "Cannot modify 'ColumnDefinitionCollection' in read-only state.";
-    public const string DefaultAnimatorCantAnimate = "DefaultAnimatorCantAnimate";
-    public const string DefaultAnimationRateAnimationRateDefault = "DefaultAnimationRateAnimationRateDefault";
-    public const string DefaultAnimatorIterativeAnimationDefault = "DefaultAnimatorIterativeAnimationDefault";
-    public const string DestMultidimensional = "Destination is multidimensional. Expected array of rank 1.";
-    public const string EnumerationFinished = "Enumeration already finished.";
-    public const string EnumerationNotStarted = "Enumeration has not started. Call MoveNext.";
-    public const string InvalidDefaultStackLength = "The default stack length must be Auto or an explicit value.";
-    public const string MustBeColumnDefinition = "'ColumnDefinitionCollection' must be type 'ColumnDefinition'.";
-    public const string MustBeRowDefinition = "'RowDefinitionCollection' must be type 'RowDefinition'.";
-    public const string MustBeStackDefinition = "'StackDefinitionCollection' must be type 'StackDefinition'.";
-    public const string RowValueIsReadOnly = "Cannot modify 'StackDefinitionCollection' in read-only state.";
-    public const string StackValueIsReadOnly = "Cannot modify 'StackDefinitionCollection' in read-only state.";
-    public const string UnexpectedType = "Expected type '{0}', got '{1}'.";
-
-
-    private static readonly ResourceManager _resourceManager;
-
-    #endregion
-
-    #region Constructor
-
-    static ErrorMessages()
-    {
-      _resourceManager = new ResourceManager( "Xceed.Wpf.Toolkit.Core.ErrorMessages", typeof( ErrorMessages ).Assembly );
-    }
-
-    #endregion
-
-    public static string GetMessage( string msgId )
-    {
-      return _resourceManager.GetString( msgId );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx
deleted file mode 100644
index 8addfd76..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AnimationAccelerationRatioOOR" xml:space="preserve">
-    <value>AnimationAccelerationRatio must be between 0.0 and 1.0.</value>
-  </data>
-  <data name="AnimationDecelerationRatioOOR" xml:space="preserve">
-    <value>AnimationDecelerationRatio must be between 0.0 and 1.0.</value>
-  </data>
-  <data name="AnimationStateNeedsHelper" xml:space="preserve">
-    <value>ItemAnimationState can only be used once the animation helper has been assigned</value>
-  </data>
-  <data name="CannotConvertBackToRange" xml:space="preserve">
-    <value>Cannot convert back to a range.</value>
-  </data>
-  <data name="ContainerModelAlreadyRemoved" xml:space="preserve">
-    <value>Container model was already removed from children collection.</value>
-  </data>
-  <data name="DefaultAnimationRateAnimationRateDefault" xml:space="preserve">
-    <value>The DefaultAnimationRate property cannot be set to AnimationRate.Default.  It must have a valid AnimationRate value.</value>
-  </data>
-  <data name="DefaultAnimatorCantAnimate" xml:space="preserve">
-    <value>The DefaultAnimator cannot actually be used for animation.</value>
-  </data>
-  <data name="DefaultAnimatorIterativeAnimationDefault" xml:space="preserve">
-    <value>The DefaultAnimator property cannot be set to IterativeAnimation.Default.  It must be a valid IterativeAnimator value or null.</value>
-  </data>
-  <data name="EndAngleCannotBeSetDirectlyInSlice" xml:space="preserve">
-    <value>The EndAngle property cannot be set directly while a Pie's Mode is Slice. You must set the Slice property instead.</value>
-  </data>
-  <data name="GlassEnabledNeedsFullTrust" xml:space="preserve">
-    <value>GlassEnabled can be set only in Full Trust enviornments</value>
-  </data>
-  <data name="InvalidRatePropertyAccessed" xml:space="preserve">
-    <value>Unable to return a {0} value for an AnimationRate value of '{1}'. This AnimationRate is represented as a {2} value.</value>
-  </data>
-  <data name="ItemMustBeAVisual" xml:space="preserve">
-    <value>item must be a Visual</value>
-  </data>
-  <data name="ItemMustBeMode3DOrVisual3D" xml:space="preserve">
-    <value>item must be either a Model3D or a Visual3D.</value>
-  </data>
-  <data name="MethodNotImplemented" xml:space="preserve">
-    <value>The method or operation is not implemented.</value>
-  </data>
-  <data name="NegativeSpeedNotSupported" xml:space="preserve">
-    <value>Speed must be greater than or equal to zero.</value>
-  </data>
-  <data name="NegativeTimeSpanNotSupported" xml:space="preserve">
-    <value>Duration (TimeSpan) must be greater than or equal to zero.</value>
-  </data>
-  <data name="OperationNotSupported" xml:space="preserve">
-    <value>Operation not supported on the platform</value>
-  </data>
-  <data name="OrderedItemsNeedEveryVisible" xml:space="preserve">
-    <value>orderedItems must contain every item in the visible items.</value>
-  </data>
-  <data name="PositionOnlyAccessibleOnAbsolute" xml:space="preserve">
-    <value>The Position property can only be accessed on an absolute view.</value>
-  </data>
-  <data name="RegionOnlyAccessibleOnRegionalView" xml:space="preserve">
-    <value>The Region property can only be accessed on a region-based view.</value>
-  </data>
-  <data name="ScaleOnlyAccessibleOnAbsolute" xml:space="preserve">
-    <value>The Scale property can only be accessed on an absolute view.</value>
-  </data>
-  <data name="SetNewToValueSetOnCompletedHelper" xml:space="preserve">
-    <value>SetNewToValue set on a completed animation helper</value>
-  </data>
-  <data name="SliceCannotBeSetDirectlyInEndAngle" xml:space="preserve">
-    <value>The Slice property cannot be set directly while a Pie's Mode is EndAngle. You must set the EndAngle property instead.</value>
-  </data>
-  <data name="SliceOOR" xml:space="preserve">
-    <value>Slice must be between 0.0 and 1.0.</value>
-  </data>
-  <data name="SuppliedValueWasNotBool" xml:space="preserve">
-    <value>Error converting from bool value to Visibility value. Supplied value was not of type bool.</value>
-  </data>
-  <data name="SuppliedValueWasNotVisibility" xml:space="preserve">
-    <value>Error converting from Visibility value to bool value. Supplied value was not of type Visibility.</value>
-  </data>
-  <data name="ToAndFromMatrixAreEqual" xml:space="preserve">
-    <value>To and from matrix are equal</value>
-  </data>
-  <data name="UnableToConvertToZoomboxView" xml:space="preserve">
-    <value>Unable to convert object '{0}' to ZoomboxView.</value>
-  </data>
-  <data name="ValueToConvertMustBeNumber" xml:space="preserve">
-    <value>Value to convert must be a number.</value>
-  </data>
-  <data name="ViewModeInvalidForSource" xml:space="preserve">
-    <value>The ViewStackMode must be Default or Manual while ViewStackSource is in use.</value>
-  </data>
-  <data name="ViewStackCannotBeManipulatedNow" xml:space="preserve">
-    <value>The ViewStack cannot be directly manipulated. Operation is not valid while ViewStackSource is in use. Access and modify members of the Zoombox.ViewStackSource instead.</value>
-  </data>
-  <data name="VisibleMustEqualOrdered" xml:space="preserve">
-    <value>VisibleItemCount and orderedItems count must be equal.</value>
-  </data>
-  <data name="ZoomboxContentMustBeUIElement" xml:space="preserve">
-    <value>The Content property of a Zoombox control must specify a UIElement.</value>
-  </data>
-  <data name="ZoomboxHasViewFinderButNotDisplay" xml:space="preserve">
-    <value>The Zoombox template contains a ViewFinder element but it does not contain a ZoomboxViewFinderDisplay element</value>
-  </data>
-  <data name="ZoomboxTemplateNeedsContent" xml:space="preserve">
-    <value>The Zoombox template does not contain a content presenter.</value>
-  </data>
-  <data name="ZoomboxViewAlreadyInitialized" xml:space="preserve">
-    <value>The ZoomboxView instance is already initialized for a different type of view: {0}</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
deleted file mode 100644
index 7c376726..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class IndexChangedEventArgs : PropertyChangedEventArgs<int>
-  {
-    #region Constructors
-
-    public IndexChangedEventArgs( RoutedEvent routedEvent, int oldIndex, int newIndex )
-      : base( routedEvent, oldIndex, newIndex )
-    {
-    }
-
-    #endregion
-
-    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
-    {
-      ( ( IndexChangedEventHandler )genericHandler )( genericTarget, this );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
deleted file mode 100644
index 9a81349f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public delegate void IndexChangedEventHandler( object sender, IndexChangedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
deleted file mode 100644
index 83d0562a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.Core.Input
-{
-  public interface IValidateInput
-  {
-    event InputValidationErrorEventHandler InputValidationError;
-    bool CommitInput();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
deleted file mode 100644
index bc7c6151..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.Core.Input
-{
-  public delegate void InputValidationErrorEventHandler( object sender, InputValidationErrorEventArgs e );
-
-  public class InputValidationErrorEventArgs : EventArgs
-  {
-    #region Constructors
-
-    public InputValidationErrorEventArgs( Exception e )
-    {
-      Exception = e;
-    }
-
-    #endregion
-
-    #region Exception Property
-
-    public Exception Exception
-    {
-      get
-      {
-        return exception;
-      }
-      private set
-      {
-        exception = value;
-      }
-    }
-
-    private Exception exception;
-
-    #endregion
-
-    #region ThrowException Property
-
-    public bool ThrowException
-    {
-      get
-      {
-        return _throwException;
-      }
-      set
-      {
-        _throwException = value;
-      }
-    }
-
-    private bool _throwException;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
deleted file mode 100644
index 0e82cf02..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-
-namespace Xceed.Wpf.Toolkit.Core.Input
-{
-  public enum KeyModifier
-  {
-    None,
-    Blocked,
-    Ctrl,
-    LeftCtrl,
-    RightCtrl,
-    Shift,
-    LeftShift,
-    RightShift,
-    Alt,
-    LeftAlt,
-    RightAlt,
-    Exact,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
deleted file mode 100644
index e1c47a14..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit.Core.Input
-{
-  [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-  public class KeyModifierCollection : Collection<KeyModifier>
-  {
-    #region AreActive Property
-
-    public bool AreActive
-    {
-      get
-      {
-        if( this.Count == 0 )
-          return true;
-
-        // if the Blocked modifier is present, then the action is not allowed
-        // so simply return false
-        if( this.Contains( KeyModifier.Blocked ) )
-          return false;
-
-        if( this.Contains( KeyModifier.Exact ) )
-          return this.IsExactMatch();
-
-        return this.MatchAny();
-      }
-    }
-
-    #endregion
-
-    private static bool IsKeyPressed( KeyModifier modifier, ICollection<Key> keys )
-    {
-      switch( modifier )
-      {
-        case KeyModifier.Alt:
-          return keys.Contains( Key.LeftAlt )
-              || keys.Contains( Key.RightAlt );
-
-        case KeyModifier.LeftAlt:
-          return keys.Contains( Key.LeftAlt );
-
-        case KeyModifier.RightAlt:
-          return keys.Contains( Key.RightAlt );
-
-        case KeyModifier.Ctrl:
-          return keys.Contains( Key.LeftCtrl )
-              || keys.Contains( Key.RightCtrl );
-
-        case KeyModifier.LeftCtrl:
-          return keys.Contains( Key.LeftCtrl );
-
-        case KeyModifier.RightCtrl:
-          return keys.Contains( Key.RightCtrl );
-
-        case KeyModifier.Shift:
-          return keys.Contains( Key.LeftShift )
-              || keys.Contains( Key.RightShift );
-
-        case KeyModifier.LeftShift:
-          return keys.Contains( Key.LeftShift );
-
-        case KeyModifier.RightShift:
-          return keys.Contains( Key.RightShift );
-
-        case KeyModifier.None:
-          return true;
-
-        default:
-          throw new NotSupportedException( "Unknown modifier" );
-      }
-    }
-
-    private static bool HasModifier( Key key, ICollection<KeyModifier> modifiers )
-    {
-      switch( key )
-      {
-        case Key.LeftAlt:
-          return modifiers.Contains( KeyModifier.Alt )
-              || modifiers.Contains( KeyModifier.LeftAlt );
-
-        case Key.RightAlt:
-          return modifiers.Contains( KeyModifier.Alt )
-              || modifiers.Contains( KeyModifier.RightAlt );
-
-        case Key.LeftCtrl:
-          return modifiers.Contains( KeyModifier.Ctrl )
-              || modifiers.Contains( KeyModifier.LeftCtrl );
-
-        case Key.RightCtrl:
-          return modifiers.Contains( KeyModifier.Ctrl )
-              || modifiers.Contains( KeyModifier.RightCtrl );
-
-        case Key.LeftShift:
-          return modifiers.Contains( KeyModifier.Shift )
-              || modifiers.Contains( KeyModifier.LeftShift );
-
-        case Key.RightShift:
-          return modifiers.Contains( KeyModifier.Shift )
-              || modifiers.Contains( KeyModifier.RightShift );
-
-        default:
-          throw new NotSupportedException( "Unknown key" );
-      }
-    }
-
-    private bool IsExactMatch()
-    {
-      HashSet<KeyModifier> modifiers = this.GetKeyModifiers();
-      HashSet<Key> keys = this.GetKeysPressed();
-
-      // No key must be pressed for the modifier None.
-      if( this.Contains( KeyModifier.None ) )
-        return ( modifiers.Count == 0 )
-            && ( keys.Count == 0 );
-
-      // Make sure every modifier has a matching key pressed.
-      foreach( KeyModifier modifier in modifiers )
-      {
-        if( !KeyModifierCollection.IsKeyPressed( modifier, keys ) )
-          return false;
-      }
-
-      // Make sure every key pressed has a matching modifier.
-      foreach( Key key in keys )
-      {
-        if( !KeyModifierCollection.HasModifier( key, modifiers ) )
-          return false;
-      }
-
-      return true;
-    }
-
-    private bool MatchAny()
-    {
-      if( this.Contains( KeyModifier.None ) )
-        return true;
-
-      HashSet<KeyModifier> modifiers = this.GetKeyModifiers();
-      HashSet<Key> keys = this.GetKeysPressed();
-
-      foreach( KeyModifier modifier in modifiers )
-      {
-        if( KeyModifierCollection.IsKeyPressed( modifier, keys ) )
-          return true;
-      }
-
-      return false;
-    }
-
-    private HashSet<KeyModifier> GetKeyModifiers()
-    {
-      HashSet<KeyModifier> modifiers = new HashSet<KeyModifier>();
-
-      foreach( KeyModifier modifier in this )
-      {
-        switch( modifier )
-        {
-          case KeyModifier.Alt:
-          case KeyModifier.LeftAlt:
-          case KeyModifier.RightAlt:
-          case KeyModifier.Ctrl:
-          case KeyModifier.LeftCtrl:
-          case KeyModifier.RightCtrl:
-          case KeyModifier.Shift:
-          case KeyModifier.LeftShift:
-          case KeyModifier.RightShift:
-            {
-              if( !modifiers.Contains( modifier ) )
-              {
-                modifiers.Add( modifier );
-              }
-            }
-            break;
-
-          default:
-            break;
-        }
-      }
-
-      return modifiers;
-    }
-
-    private HashSet<Key> GetKeysPressed()
-    {
-      HashSet<Key> keys = new HashSet<Key>();
-
-      if( Keyboard.IsKeyDown( Key.LeftAlt ) )
-        keys.Add( Key.LeftAlt );
-      if( Keyboard.IsKeyDown( Key.RightAlt ) )
-        keys.Add( Key.RightAlt );
-      if( Keyboard.IsKeyDown( Key.LeftCtrl ) )
-        keys.Add( Key.LeftCtrl );
-      if( Keyboard.IsKeyDown( Key.RightCtrl ) )
-        keys.Add( Key.RightCtrl );
-      if( Keyboard.IsKeyDown( Key.LeftShift ) )
-        keys.Add( Key.LeftShift );
-      if( Keyboard.IsKeyDown( Key.RightShift ) )
-        keys.Add( Key.RightShift );
-
-      return keys;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
deleted file mode 100644
index cec587da..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.ComponentModel.Design.Serialization;
-using System.Globalization;
-using System.Reflection;
-using System.Security;
-
-namespace Xceed.Wpf.Toolkit.Core.Input
-{
-  public sealed class KeyModifierCollectionConverter : TypeConverter
-  {
-    #region Static Fields
-
-    private static readonly TypeConverter _keyModifierConverter = TypeDescriptor.GetConverter( typeof( KeyModifier ) );
-
-    #endregion
-
-    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return _keyModifierConverter.CanConvertFrom( typeDescriptorContext, type );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( InstanceDescriptor )
-          || type == typeof( KeyModifierCollection )
-          || type == typeof( string ) );
-    }
-
-    public override object ConvertFrom( ITypeDescriptorContext typeDescriptorContext,
-        CultureInfo cultureInfo, object value )
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      string stringValue = value as string;
-
-      // convert null as None
-      if( value == null
-          || ( stringValue != null && stringValue.Trim() == string.Empty ) )
-      {
-        result.Add( KeyModifier.None );
-      }
-      else
-      {
-        // respect the following separators: '+', ' ', '|', or ','
-        foreach( string token in stringValue.Split( new char[] { '+', ' ', '|', ',' },
-                StringSplitOptions.RemoveEmptyEntries ) )
-          result.Add( ( KeyModifier )_keyModifierConverter.ConvertFrom( typeDescriptorContext, cultureInfo, token ) );
-
-        // if nothing added, assume None
-        if( result.Count == 0 )
-          result.Add( KeyModifier.None );
-      }
-      return result;
-    }
-
-    public override object ConvertTo( ITypeDescriptorContext typeDescriptorContext,
-        CultureInfo cultureInfo, object value, Type destinationType )
-    {
-      // special handling for null or an empty collection
-      if( value == null || ( ( KeyModifierCollection )value ).Count == 0 )
-      {
-        if( destinationType == typeof( InstanceDescriptor ) )
-        {
-          object result = null;
-          try
-          {
-            result = ConstructInstanceDescriptor();
-          }
-          catch( SecurityException )
-          {
-          }
-          return result;
-        }
-        else if( destinationType == typeof( string ) )
-        {
-          return _keyModifierConverter.ConvertTo( typeDescriptorContext,
-                  cultureInfo, KeyModifier.None, destinationType );
-        }
-      }
-
-      // return a '+' delimited string containing the modifiers
-      if( destinationType == typeof( string ) )
-      {
-        string result = string.Empty;
-        foreach( KeyModifier modifier in ( KeyModifierCollection )value )
-        {
-          if( result != string.Empty )
-            result = result + '+';
-
-          result = result + _keyModifierConverter.ConvertTo( typeDescriptorContext,
-                  cultureInfo, modifier, destinationType );
-        }
-        return result;
-      }
-
-      // unexpected type requested so return null
-      return null;
-    }
-
-    private static object ConstructInstanceDescriptor()
-    {
-      ConstructorInfo ci = typeof( KeyModifierCollection ).GetConstructor( new Type[] { } );
-      return new InstanceDescriptor( ci, new Object[] { } );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
deleted file mode 100644
index 793cb9e1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class InvalidContentException : Exception
-  {
-    #region Constructors
-
-    public InvalidContentException( string message )
-      : base( message )
-    {
-    }
-
-    public InvalidContentException( string message, Exception innerException )
-      : base( message, innerException )
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
deleted file mode 100644
index 97fc54bf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class InvalidTemplateException : Exception
-  {
-    #region Constructors
-
-    public InvalidTemplateException( string message )
-      : base( message )
-    {
-    }
-
-    public InvalidTemplateException( string message, Exception innerException )
-      : base( message, innerException )
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
deleted file mode 100644
index 1d67d3fd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public enum Location
-  {
-    Left,
-    Right
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
deleted file mode 100644
index 3ec7e7ba..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
+++ /dev/null
@@ -1,346 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  [TypeConverter( typeof( AnimationRateConverter ) )]
-  [StructLayout( LayoutKind.Explicit )]
-  public struct AnimationRate
-  {
-    #region Static Fields
-
-    private static AnimationRate _default = new AnimationRate( true );
-
-    #endregion
-
-    #region Constructors
-
-    public AnimationRate( TimeSpan duration )
-    {
-      if( duration < TimeSpan.Zero )
-      {
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.NegativeTimeSpanNotSupported ) );
-      }
-      _speed = 0d;
-      _duration = duration.Ticks;
-      _rateType = RateType.TimeSpan;
-    }
-
-    public AnimationRate( double speed )
-    {
-      if( DoubleHelper.IsNaN( speed ) || speed < 0d )
-      {
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.NegativeSpeedNotSupported ) );
-      }
-      _duration = 0;
-      _speed = speed;
-      _rateType = RateType.Speed;
-    }
-
-    private AnimationRate( bool ignore )
-    {
-      _duration = 0;
-      _speed = double.NaN;
-      _rateType = RateType.Speed;
-    }
-
-    #endregion
-
-    #region Default Property
-
-    public static AnimationRate Default
-    {
-      get
-      {
-        return _default;
-      }
-    }
-
-    #endregion
-
-    #region HasDuration Property
-
-    public bool HasDuration
-    {
-      get
-      {
-        return ( _rateType == RateType.TimeSpan );
-      }
-    }
-
-    #endregion
-
-    #region Duration Property
-
-    public TimeSpan Duration
-    {
-      get
-      {
-        if( this.HasDuration )
-          return TimeSpan.FromTicks( _duration );
-
-        throw new InvalidOperationException( 
-          string.Format(
-            ErrorMessages.GetMessage( ErrorMessages.InvalidRatePropertyAccessed ),
-            "Duration", 
-            this, 
-            "Speed" ) );
-      }
-    }
-
-    #endregion
-
-    #region HasSpeed Property
-
-    public bool HasSpeed
-    {
-      get
-      {
-        return ( _rateType == RateType.Speed );
-      }
-    }
-
-    #endregion
-
-    #region Speed Property
-
-    public double Speed
-    {
-      get
-      {
-        if( this.HasSpeed )
-          return _speed;
-
-        throw new InvalidOperationException( 
-          string.Format(
-            ErrorMessages.GetMessage( ErrorMessages.InvalidRatePropertyAccessed ),
-            "Speed", 
-            this, 
-            "Duration" ) );
-      }
-    }
-
-    #endregion
-
-    public AnimationRate Add( AnimationRate animationRate )
-    {
-      return this + animationRate;
-    }
-
-    public override bool Equals( Object value )
-    {
-      if( value == null )
-        return false;
-
-      if( value is AnimationRate )
-        return this.Equals( ( AnimationRate )value );
-
-      return false;
-    }
-
-    public bool Equals( AnimationRate animationRate )
-    {
-      if( this.HasDuration )
-      {
-        if( animationRate.HasDuration )
-          return _duration == animationRate._duration;
-
-        return false;
-      }
-      else // HasSpeed
-      {
-        if( animationRate.HasSpeed )
-        {
-          if( DoubleHelper.IsNaN( _speed ) )
-            return DoubleHelper.IsNaN( animationRate._speed );
-
-          return _speed == animationRate._speed;
-        }
-
-        return false;
-      }
-    }
-
-    public static bool Equals( AnimationRate t1, AnimationRate t2 )
-    {
-      return t1.Equals( t2 );
-    }
-
-    public override int GetHashCode()
-    {
-      if( this.HasDuration )
-        return _duration.GetHashCode();
-
-      return _speed.GetHashCode();
-    }
-
-    public AnimationRate Subtract( AnimationRate animationRate )
-    {
-      return this - animationRate;
-    }
-
-    public override string ToString()
-    {
-      if( this.HasDuration )
-        return TypeDescriptor.GetConverter( _duration ).ConvertToString( _duration );
-
-      return TypeDescriptor.GetConverter( _speed ).ConvertToString( _speed );
-    }
-
-    #region Operators Methods
-
-    public static implicit operator AnimationRate( TimeSpan duration )
-    {
-      if( duration < TimeSpan.Zero )
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.NegativeTimeSpanNotSupported ) );
-
-      return new AnimationRate( duration );
-    }
-
-    public static implicit operator AnimationRate( double speed )
-    {
-      if( DoubleHelper.IsNaN( speed ) || speed < 0 )
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.NegativeSpeedNotSupported ) );
-
-      return new AnimationRate( speed );
-    }
-
-    public static implicit operator AnimationRate( int speed )
-    {
-      if( DoubleHelper.IsNaN( speed ) || speed < 0 )
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.NegativeSpeedNotSupported ) );
-
-      return new AnimationRate( ( double )speed );
-    }
-
-    public static AnimationRate operator +( AnimationRate t1, AnimationRate t2 )
-    {
-      if( t1.HasDuration && t2.HasDuration )
-        return new AnimationRate( t1._duration + t2._duration );
-
-      if( t1.HasSpeed && t2.HasSpeed )
-        return new AnimationRate( t1._speed + t2._speed );
-
-      return ( AnimationRate )0d;
-    }
-
-    public static AnimationRate operator -( AnimationRate t1, AnimationRate t2 )
-    {
-      if( t1.HasDuration && t2.HasDuration )
-        return new AnimationRate( t1._duration - t2._duration );
-
-      if( t1.HasSpeed && t2.HasSpeed )
-        return new AnimationRate( t1._speed - t2._speed );
-
-      return ( AnimationRate )0d;
-    }
-
-    public static bool operator ==( AnimationRate t1, AnimationRate t2 )
-    {
-      return t1.Equals( t2 );
-    }
-
-    public static bool operator !=( AnimationRate t1, AnimationRate t2 )
-    {
-      return !( t1.Equals( t2 ) );
-    }
-
-    public static bool operator >( AnimationRate t1, AnimationRate t2 )
-    {
-      if( t1.HasDuration && t2.HasDuration )
-        return t1._duration > t2._duration;
-
-      if( t1.HasSpeed && t2.HasSpeed )
-        return ( t1._speed > t2._speed ) && !DoubleHelper.AreVirtuallyEqual( t1._speed, t2._speed );
-
-      // arbitrary: assume a Speed is greater than a Duration
-      return t1.HasSpeed;
-    }
-
-    public static bool operator >=( AnimationRate t1, AnimationRate t2 )
-    {
-      return !( t1 < t2 );
-    }
-
-    public static bool operator <( AnimationRate t1, AnimationRate t2 )
-    {
-      if( t1.HasDuration && t2.HasDuration )
-        return t1._duration < t2._duration;
-
-      if( t1.HasSpeed && t2.HasSpeed )
-        return ( t1._speed < t2._speed ) && !DoubleHelper.AreVirtuallyEqual( t1._speed, t2._speed );
-
-      // arbitrary: assume a Speed is greater than a Duration
-      return t1.HasDuration;
-    }
-
-    public static bool operator <=( AnimationRate t1, AnimationRate t2 )
-    {
-      return !( t1 > t2 );
-    }
-
-    public static int Compare( AnimationRate t1, AnimationRate t2 )
-    {
-      if( t1 < t2 )
-        return -1;
-
-      if( t1 > t2 )
-        return 1;
-
-      // Neither is greater than the other
-      return 0;
-    }
-
-    public static AnimationRate Plus( AnimationRate animationRate )
-    {
-      return animationRate;
-    }
-
-    public static AnimationRate operator +( AnimationRate animationRate )
-    {
-      return animationRate;
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    [FieldOffset( 0 )]
-    long _duration;
-    [FieldOffset( 0 )]
-    double _speed;
-    [FieldOffset( 8 )]
-    RateType _rateType;
-
-    #endregion
-
-    #region RateType Nested Type
-
-    private enum RateType
-    {
-      TimeSpan,
-      Speed,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
deleted file mode 100644
index c8b9024f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.ComponentModel.Design.Serialization;
-using System.Globalization;
-using System.Reflection;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  public class AnimationRateConverter : TypeConverter
-  {
-    public override bool CanConvertFrom( ITypeDescriptorContext td, Type t )
-    {
-      return ( t == typeof( string ) )
-          || ( t == typeof( double ) )
-          || ( t == typeof( int ) )
-          || ( t == typeof( TimeSpan ) );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext context, Type destinationType )
-    {
-      return ( destinationType == typeof( InstanceDescriptor ) )
-          || ( destinationType == typeof( string ) )
-          || ( destinationType == typeof( double ) )
-          || ( destinationType == typeof( TimeSpan ) );
-    }
-
-    public override object ConvertFrom(
-      ITypeDescriptorContext td,
-      CultureInfo cultureInfo,
-      object value )
-    {
-      Type valueType = value.GetType();
-      if( value is string )
-      {
-        string stringValue = value as string;
-        if( ( value as string ).Contains( ":" ) )
-        {
-          TimeSpan duration = TimeSpan.Zero;
-          duration = ( TimeSpan )TypeDescriptor.GetConverter( duration ).ConvertFrom( td, cultureInfo, value );
-          return new AnimationRate( duration );
-        }
-        else
-        {
-          double speed = 0;
-          speed = ( double )TypeDescriptor.GetConverter( speed ).ConvertFrom( td, cultureInfo, value );
-          return new AnimationRate( speed );
-        }
-      }
-      else if( valueType == typeof( double ) )
-      {
-        return ( AnimationRate )( double )value;
-      }
-      else if( valueType == typeof( int ) )
-      {
-        return ( AnimationRate )( int )value;
-      }
-      else // TimeSpan
-      {
-        return ( AnimationRate )( TimeSpan )value;
-      }
-    }
-
-    public override object ConvertTo(
-      ITypeDescriptorContext context,
-      CultureInfo cultureInfo,
-      object value,
-      Type destinationType )
-    {
-      if( destinationType != null && value is AnimationRate )
-      {
-        AnimationRate rateValue = ( AnimationRate )value;
-
-        if( destinationType == typeof( InstanceDescriptor ) )
-        {
-          MemberInfo mi;
-          if( rateValue.HasDuration )
-          {
-            mi = typeof( AnimationRate ).GetConstructor( new Type[] { typeof( TimeSpan ) } );
-            return new InstanceDescriptor( mi, new object[] { rateValue.Duration } );
-          }
-          else if( rateValue.HasSpeed )
-          {
-            mi = typeof( AnimationRate ).GetConstructor( new Type[] { typeof( double ) } );
-            return new InstanceDescriptor( mi, new object[] { rateValue.Speed } );
-          }
-        }
-        else if( destinationType == typeof( string ) )
-        {
-          return rateValue.ToString();
-        }
-        else if( destinationType == typeof( double ) )
-        {
-          return rateValue.HasSpeed ? rateValue.Speed : 0.0d;
-        }
-        else if( destinationType == typeof( TimeSpan ) )
-        {
-          return rateValue.HasDuration ? rateValue.Duration : TimeSpan.FromSeconds( 0 );
-        }
-      }
-
-      return base.ConvertTo( context, cultureInfo, value, destinationType );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
deleted file mode 100644
index 1cc8fcb1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  [TypeConverter( typeof( IterativeEquationConverter ) )]
-  public class IterativeEquation<T>
-  {
-    #region Constructors
-
-    public IterativeEquation( IterativeAnimationEquationDelegate<T> equation )
-    {
-      _equation = equation;
-    }
-
-    internal IterativeEquation()
-    {
-    }
-
-    #endregion
-
-    public virtual T Evaluate( TimeSpan currentTime, T from, T to, TimeSpan duration )
-    {
-      return _equation( currentTime, from, to, duration );
-    }
-
-    #region Private Fields
-
-    private readonly IterativeAnimationEquationDelegate<T> _equation;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
deleted file mode 100644
index dbb3d684..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  public delegate T IterativeAnimationEquationDelegate<T>( TimeSpan currentTime, T from, T to, TimeSpan duration );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
deleted file mode 100644
index 57f56b0e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Globalization;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  public class IterativeEquationConverter : TypeConverter
-  {
-    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return type == typeof( string );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return type == typeof( IterativeEquation<double> );
-    }
-
-    public override object ConvertFrom( 
-      ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
-      object value )
-    {
-      IterativeEquation<double> result = null;
-
-      if( value is string )
-      {
-        switch( value as string )
-        {
-          case "BackEaseIn":
-            result = PennerEquations.BackEaseIn as IterativeEquation<double>;
-            break;
-          case "BackEaseInOut":
-            result = PennerEquations.BackEaseInOut as IterativeEquation<double>;
-            break;
-          case "BackEaseOut":
-            result = PennerEquations.BackEaseOut as IterativeEquation<double>;
-            break;
-          case "BounceEaseIn":
-            result = PennerEquations.BounceEaseIn as IterativeEquation<double>;
-            break;
-          case "BounceEaseInOut":
-            result = PennerEquations.BounceEaseInOut as IterativeEquation<double>;
-            break;
-          case "BounceEaseOut":
-            result = PennerEquations.BounceEaseOut as IterativeEquation<double>;
-            break;
-          case "CircEaseIn":
-            result = PennerEquations.CircEaseIn as IterativeEquation<double>;
-            break;
-          case "CircEaseInOut":
-            result = PennerEquations.CircEaseInOut as IterativeEquation<double>;
-            break;
-          case "CircEaseOut":
-            result = PennerEquations.CircEaseOut as IterativeEquation<double>;
-            break;
-          case "CubicEaseIn":
-            result = PennerEquations.CubicEaseIn as IterativeEquation<double>;
-            break;
-          case "CubicEaseInOut":
-            result = PennerEquations.CubicEaseInOut as IterativeEquation<double>;
-            break;
-          case "CubicEaseOut":
-            result = PennerEquations.CubicEaseOut as IterativeEquation<double>;
-            break;
-          case "ElasticEaseIn":
-            result = PennerEquations.ElasticEaseIn as IterativeEquation<double>;
-            break;
-          case "ElasticEaseInOut":
-            result = PennerEquations.ElasticEaseInOut as IterativeEquation<double>;
-            break;
-          case "ElasticEaseOut":
-            result = PennerEquations.ElasticEaseOut as IterativeEquation<double>;
-            break;
-          case "ExpoEaseIn":
-            result = PennerEquations.ExpoEaseIn as IterativeEquation<double>;
-            break;
-          case "ExpoEaseInOut":
-            result = PennerEquations.ExpoEaseInOut as IterativeEquation<double>;
-            break;
-          case "ExpoEaseOut":
-            result = PennerEquations.ExpoEaseOut as IterativeEquation<double>;
-            break;
-          case "Linear":
-            result = PennerEquations.Linear as IterativeEquation<double>;
-            break;
-          case "QuadEaseIn":
-            result = PennerEquations.QuadEaseIn as IterativeEquation<double>;
-            break;
-          case "QuadEaseInOut":
-            result = PennerEquations.QuadEaseInOut as IterativeEquation<double>;
-            break;
-          case "QuadEaseOut":
-            result = PennerEquations.QuadEaseOut as IterativeEquation<double>;
-            break;
-          case "QuartEaseIn":
-            result = PennerEquations.QuartEaseIn as IterativeEquation<double>;
-            break;
-          case "QuartEaseInOut":
-            result = PennerEquations.QuartEaseInOut as IterativeEquation<double>;
-            break;
-          case "QuartEaseOut":
-            result = PennerEquations.QuartEaseOut as IterativeEquation<double>;
-            break;
-          case "QuintEaseIn":
-            result = PennerEquations.QuintEaseIn as IterativeEquation<double>;
-            break;
-          case "QuintEaseInOut":
-            result = PennerEquations.QuintEaseInOut as IterativeEquation<double>;
-            break;
-          case "QuintEaseOut":
-            result = PennerEquations.QuintEaseOut as IterativeEquation<double>;
-            break;
-          case "SineEaseIn":
-            result = PennerEquations.SineEaseIn as IterativeEquation<double>;
-            break;
-          case "SineEaseInOut":
-            result = PennerEquations.SineEaseInOut as IterativeEquation<double>;
-            break;
-          case "SineEaseOut":
-            result = PennerEquations.SineEaseOut as IterativeEquation<double>;
-            break;
-        }
-      }
-
-      return result;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
deleted file mode 100644
index 41c3a77a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  public class PennerEquation : IterativeEquation<double>
-  {
-    #region Constructors
-
-    internal PennerEquation( PennerEquationDelegate pennerImpl )
-    {
-      _pennerImpl = pennerImpl;
-    }
-
-    #endregion
-
-    public override double Evaluate( TimeSpan currentTime, double from, double to, TimeSpan duration )
-    {
-      double t = currentTime.TotalSeconds;
-      double b = from;
-      double c = to - from;
-      double d = duration.TotalSeconds;
-
-      return _pennerImpl( t, b, c, d );
-    }
-
-    #region Private Fields
-
-    private readonly PennerEquationDelegate _pennerImpl;
-
-    #endregion
-
-    #region PennerEquationDelegate Delegate
-
-    internal delegate double PennerEquationDelegate( double t, double b, double c, double d );
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
deleted file mode 100644
index 4b7765a6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
+++ /dev/null
@@ -1,851 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  public static class PennerEquations
-  {
-    #region BackEaseIn Static Property
-
-    public static PennerEquation BackEaseIn
-    {
-      get
-      {
-        if( _backEaseIn == null )
-        {
-          _backEaseIn = new PennerEquation( BackEaseInImpl );
-        }
-        return _backEaseIn;
-      }
-    }
-
-    private static PennerEquation _backEaseIn;
-
-    #endregion
-
-    #region BackEaseInOut Static Property
-
-    public static PennerEquation BackEaseInOut
-    {
-      get
-      {
-        if( _backEaseInOut == null )
-        {
-          _backEaseInOut = new PennerEquation( BackEaseInOutImpl );
-        }
-        return _backEaseInOut;
-      }
-    }
-
-    private static PennerEquation _backEaseInOut;
-
-    #endregion
-
-    #region BackEaseOut Static Property
-
-    public static PennerEquation BackEaseOut
-    {
-      get
-      {
-        if( _backEaseOut == null )
-        {
-          _backEaseOut = new PennerEquation( BackEaseOutImpl );
-        }
-        return _backEaseOut;
-      }
-    }
-
-    private static PennerEquation _backEaseOut;
-
-    #endregion
-
-    #region BounceEaseIn Static Property
-
-    public static PennerEquation BounceEaseIn
-    {
-      get
-      {
-        if( _bounceEaseIn == null )
-        {
-          _bounceEaseIn = new PennerEquation( BounceEaseInImpl );
-        }
-        return _bounceEaseIn;
-      }
-    }
-
-    private static PennerEquation _bounceEaseIn;
-
-    #endregion
-
-    #region BounceEaseInOut Static Property
-
-    public static PennerEquation BounceEaseInOut
-    {
-      get
-      {
-        if( _bounceEaseInOut == null )
-        {
-          _bounceEaseInOut = new PennerEquation( BounceEaseInOutImpl );
-        }
-        return _bounceEaseInOut;
-      }
-    }
-
-    private static PennerEquation _bounceEaseInOut;
-
-    #endregion
-
-    #region BounceEaseOut Static Property
-
-    public static PennerEquation BounceEaseOut
-    {
-      get
-      {
-        if( _bounceEaseOut == null )
-        {
-          _bounceEaseOut = new PennerEquation( BounceEaseOutImpl );
-        }
-        return _bounceEaseOut;
-      }
-    }
-
-    private static PennerEquation _bounceEaseOut;
-
-    #endregion
-
-    #region CircEaseIn Static Property
-
-    public static PennerEquation CircEaseIn
-    {
-      get
-      {
-        if( _circEaseIn == null )
-        {
-          _circEaseIn = new PennerEquation( CircEaseInImpl );
-        }
-        return _circEaseIn;
-      }
-    }
-
-    private static PennerEquation _circEaseIn;
-
-    #endregion
-
-    #region CircEaseInOut Static Property
-
-    public static PennerEquation CircEaseInOut
-    {
-      get
-      {
-        if( _circEaseInOut == null )
-        {
-          _circEaseInOut = new PennerEquation( CircEaseInOutImpl );
-        }
-        return _circEaseInOut;
-      }
-    }
-
-    private static PennerEquation _circEaseInOut;
-
-    #endregion
-
-    #region CircEaseOut Static Property
-
-    public static PennerEquation CircEaseOut
-    {
-      get
-      {
-        if( _circEaseOut == null )
-        {
-          _circEaseOut = new PennerEquation( CircEaseOutImpl );
-        }
-        return _circEaseOut;
-      }
-    }
-
-    private static PennerEquation _circEaseOut;
-
-    #endregion
-
-    #region CubicEaseIn Static Property
-
-    public static PennerEquation CubicEaseIn
-    {
-      get
-      {
-        if( _cubicEaseIn == null )
-        {
-          _cubicEaseIn = new PennerEquation( CubicEaseInImpl );
-        }
-        return _cubicEaseIn;
-      }
-    }
-
-    private static PennerEquation _cubicEaseIn;
-
-    #endregion
-
-    #region CubicEaseInOut Static Property
-
-    public static PennerEquation CubicEaseInOut
-    {
-      get
-      {
-        if( _cubicEaseInOut == null )
-        {
-          _cubicEaseInOut = new PennerEquation( CubicEaseInOutImpl );
-        }
-        return _cubicEaseInOut;
-      }
-    }
-
-    private static PennerEquation _cubicEaseInOut;
-
-    #endregion
-
-    #region CubicEaseOut Static Property
-
-    public static PennerEquation CubicEaseOut
-    {
-      get
-      {
-        if( _cubicEaseOut == null )
-        {
-          _cubicEaseOut = new PennerEquation( CubicEaseOutImpl );
-        }
-        return _cubicEaseOut;
-      }
-    }
-
-    private static PennerEquation _cubicEaseOut;
-
-    #endregion
-
-    #region ElasticEaseIn Static Property
-
-    public static PennerEquation ElasticEaseIn
-    {
-      get
-      {
-        if( _elasticEaseIn == null )
-        {
-          _elasticEaseIn = new PennerEquation( ElasticEaseInImpl );
-        }
-        return _elasticEaseIn;
-      }
-    }
-
-    private static PennerEquation _elasticEaseIn;
-
-    #endregion
-
-    #region ElasticEaseInOut Static Property
-
-    public static PennerEquation ElasticEaseInOut
-    {
-      get
-      {
-        if( _elasticEaseInOut == null )
-        {
-          _elasticEaseInOut = new PennerEquation( ElasticEaseInOutImpl );
-        }
-        return _elasticEaseInOut;
-      }
-    }
-
-    private static PennerEquation _elasticEaseInOut;
-
-    #endregion
-
-    #region ElasticEaseOut Static Property
-
-    public static PennerEquation ElasticEaseOut
-    {
-      get
-      {
-        if( _elasticEaseOut == null )
-        {
-          _elasticEaseOut = new PennerEquation( ElasticEaseOutImpl );
-        }
-        return _elasticEaseOut;
-      }
-    }
-
-    private static PennerEquation _elasticEaseOut;
-
-    #endregion
-
-    #region ExpoEaseIn Static Property
-
-    public static PennerEquation ExpoEaseIn
-    {
-      get
-      {
-        if( _expoEaseIn == null )
-        {
-          _expoEaseIn = new PennerEquation( ExpoEaseInImpl );
-        }
-        return _expoEaseIn;
-      }
-    }
-
-    private static PennerEquation _expoEaseIn;
-
-    #endregion
-
-    #region ExpoEaseInOut Static Property
-
-    public static PennerEquation ExpoEaseInOut
-    {
-      get
-      {
-        if( _expoEaseInOut == null )
-        {
-          _expoEaseInOut = new PennerEquation( ExpoEaseInOutImpl );
-        }
-        return _expoEaseInOut;
-      }
-    }
-
-    private static PennerEquation _expoEaseInOut;
-
-    #endregion
-
-    #region ExpoEaseOut Static Property
-
-    public static PennerEquation ExpoEaseOut
-    {
-      get
-      {
-        if( _expoEaseOut == null )
-        {
-          _expoEaseOut = new PennerEquation( ExpoEaseOutImpl );
-        }
-        return _expoEaseOut;
-      }
-    }
-
-    private static PennerEquation _expoEaseOut;
-
-    #endregion
-
-    #region Linear Static Property
-
-    public static PennerEquation Linear
-    {
-      get
-      {
-        if( _linear == null )
-        {
-          _linear = new PennerEquation( LinearImpl );
-        }
-        return _linear;
-      }
-    }
-
-    private static PennerEquation _linear;
-
-    #endregion
-
-    #region QuadEaseIn Static Property
-
-    public static PennerEquation QuadEaseIn
-    {
-      get
-      {
-        if( _quadEaseIn == null )
-        {
-          _quadEaseIn = new PennerEquation( QuadEaseInImpl );
-        }
-        return _quadEaseIn;
-      }
-    }
-
-    private static PennerEquation _quadEaseIn;
-
-    #endregion
-
-    #region QuadEaseInOut Static Property
-
-    public static PennerEquation QuadEaseInOut
-    {
-      get
-      {
-        if( _quadEaseInOut == null )
-        {
-          _quadEaseInOut = new PennerEquation( QuadEaseInOutImpl );
-        }
-        return _quadEaseInOut;
-      }
-    }
-
-    private static PennerEquation _quadEaseInOut;
-
-    #endregion
-
-    #region QuadEaseOut Static Property
-
-    public static PennerEquation QuadEaseOut
-    {
-      get
-      {
-        if( _quadEaseOut == null )
-        {
-          _quadEaseOut = new PennerEquation( QuadEaseOutImpl );
-        }
-        return _quadEaseOut;
-      }
-    }
-
-    private static PennerEquation _quadEaseOut;
-
-    #endregion
-
-    #region QuartEaseIn Static Property
-
-    public static PennerEquation QuartEaseIn
-    {
-      get
-      {
-        if( _quartEaseIn == null )
-        {
-          _quartEaseIn = new PennerEquation( QuartEaseInImpl );
-        }
-        return _quartEaseIn;
-      }
-    }
-
-    private static PennerEquation _quartEaseIn;
-
-    #endregion
-
-    #region QuartEaseInOut Static Property
-
-    public static PennerEquation QuartEaseInOut
-    {
-      get
-      {
-        if( _quartEaseInOut == null )
-        {
-          _quartEaseInOut = new PennerEquation( QuartEaseInOutImpl );
-        }
-        return _quartEaseInOut;
-      }
-    }
-
-    private static PennerEquation _quartEaseInOut;
-
-    #endregion
-
-    #region QuartEaseOut Static Property
-
-    public static PennerEquation QuartEaseOut
-    {
-      get
-      {
-        if( _quartEaseOut == null )
-        {
-          _quartEaseOut = new PennerEquation( QuartEaseOutImpl );
-        }
-        return _quartEaseOut;
-      }
-    }
-
-    private static PennerEquation _quartEaseOut;
-
-    #endregion
-
-    #region QuintEaseIn Static Property
-
-    public static PennerEquation QuintEaseIn
-    {
-      get
-      {
-        if( _quintEaseIn == null )
-        {
-          _quintEaseIn = new PennerEquation( QuintEaseInImpl );
-        }
-        return _quintEaseIn;
-      }
-    }
-
-    private static PennerEquation _quintEaseIn;
-
-    #endregion
-
-    #region QuintEaseInOut Static Property
-
-    public static PennerEquation QuintEaseInOut
-    {
-      get
-      {
-        if( _quintEaseInOut == null )
-        {
-          _quintEaseInOut = new PennerEquation( QuintEaseInOutImpl );
-        }
-        return _quintEaseInOut;
-      }
-    }
-
-    private static PennerEquation _quintEaseInOut;
-
-    #endregion
-
-    #region QuintEaseOut Static Property
-
-    public static PennerEquation QuintEaseOut
-    {
-      get
-      {
-        if( _quintEaseOut == null )
-        {
-          _quintEaseOut = new PennerEquation( QuintEaseOutImpl );
-        }
-        return _quintEaseOut;
-      }
-    }
-
-    private static PennerEquation _quintEaseOut;
-
-    #endregion
-
-    #region SineEaseIn Static Property
-
-    public static PennerEquation SineEaseIn
-    {
-      get
-      {
-        if( _sineEaseIn == null )
-        {
-          _sineEaseIn = new PennerEquation( SineEaseInImpl );
-        }
-        return _sineEaseIn;
-      }
-    }
-
-    private static PennerEquation _sineEaseIn;
-
-    #endregion
-
-    #region SineEaseInOut Static Property
-
-    public static PennerEquation SineEaseInOut
-    {
-      get
-      {
-        if( _sineEaseInOut == null )
-        {
-          _sineEaseInOut = new PennerEquation( SineEaseInOutImpl );
-        }
-        return _sineEaseInOut;
-      }
-    }
-
-    private static PennerEquation _sineEaseInOut;
-
-    #endregion
-
-    #region SineEaseOut Static Property
-
-    public static PennerEquation SineEaseOut
-    {
-      get
-      {
-        if( _sineEaseOut == null )
-        {
-          _sineEaseOut = new PennerEquation( SineEaseOutImpl );
-        }
-        return _sineEaseOut;
-      }
-    }
-
-    private static PennerEquation _sineEaseOut;
-
-    #endregion
-
-    #region Back Equations Methods
-
-    private static double BackEaseOutImpl( double t, double b, double c, double d )
-    {
-      return c * ( ( t = t / d - 1 ) * t * ( ( 1.70158 + 1 ) * t + 1.70158 ) + 1 ) + b;
-    }
-
-    private static double BackEaseInImpl( double t, double b, double c, double d )
-    {
-      return c * ( t /= d ) * t * ( ( 1.70158 + 1 ) * t - 1.70158 ) + b;
-    }
-
-    private static double BackEaseInOutImpl( double t, double b, double c, double d )
-    {
-      double s = 1.70158;
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * ( t * t * ( ( ( s *= ( 1.525 ) ) + 1 ) * t - s ) ) + b;
-      return c / 2 * ( ( t -= 2 ) * t * ( ( ( s *= ( 1.525 ) ) + 1 ) * t + s ) + 2 ) + b;
-    }
-
-    #endregion
-
-    #region Bounce Equations Methods
-
-    private static double BounceEaseOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d ) < ( 1 / 2.75 ) )
-      {
-        return c * ( 7.5625 * t * t ) + b;
-      }
-      else if( t < ( 2 / 2.75 ) )
-      {
-        return c * ( 7.5625 * ( t -= ( 1.5 / 2.75 ) ) * t + .75 ) + b;
-      }
-      else if( t < ( 2.5 / 2.75 ) )
-      {
-        return c * ( 7.5625 * ( t -= ( 2.25 / 2.75 ) ) * t + .9375 ) + b;
-      }
-      else
-      {
-        return c * ( 7.5625 * ( t -= ( 2.625 / 2.75 ) ) * t + .984375 ) + b;
-      }
-    }
-
-    private static double BounceEaseInImpl( double t, double b, double c, double d )
-    {
-      return c - PennerEquations.BounceEaseOutImpl( d - t, 0, c, d ) + b;
-    }
-
-    private static double BounceEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( t < d / 2 )
-      {
-        return PennerEquations.BounceEaseInImpl( t * 2, 0, c, d ) * .5 + b;
-      }
-      else
-      {
-        return PennerEquations.BounceEaseOutImpl( t * 2 - d, 0, c, d ) * .5 + c * .5 + b;
-      }
-    }
-
-    #endregion
-
-    #region Circular Equations Methods
-
-    private static double CircEaseOutImpl( double t, double b, double c, double d )
-    {
-      return c * Math.Sqrt( 1 - ( t = t / d - 1 ) * t ) + b;
-    }
-
-    private static double CircEaseInImpl( double t, double b, double c, double d )
-    {
-      return -c * ( Math.Sqrt( 1 - ( t /= d ) * t ) - 1 ) + b;
-    }
-
-    private static double CircEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return -c / 2 * ( Math.Sqrt( 1 - t * t ) - 1 ) + b;
-
-      return c / 2 * ( Math.Sqrt( 1 - ( t -= 2 ) * t ) + 1 ) + b;
-    }
-
-    #endregion
-
-    #region Cubic Equations Methods
-
-    private static double CubicEaseOutImpl( double t, double b, double c, double d )
-    {
-      return c * ( ( t = t / d - 1 ) * t * t + 1 ) + b;
-    }
-
-    private static double CubicEaseInImpl( double t, double b, double c, double d )
-    {
-      return c * ( t /= d ) * t * t + b;
-    }
-
-    private static double CubicEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * t * t * t + b;
-
-      return c / 2 * ( ( t -= 2 ) * t * t + 2 ) + b;
-    }
-
-    #endregion
-
-    #region Elastic Equations Methods
-
-    private static double ElasticEaseOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d ) == 1 )
-        return b + c;
-
-      double p = d * .3;
-      double s = p / 4;
-
-      return ( c * Math.Pow( 2, -10 * t ) * Math.Sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) + c + b );
-    }
-
-    private static double ElasticEaseInImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d ) == 1 )
-        return b + c;
-
-      double p = d * .3;
-      double s = p / 4;
-
-      return -( c * Math.Pow( 2, 10 * ( t -= 1 ) ) * Math.Sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) ) + b;
-    }
-
-    private static double ElasticEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) == 2 )
-        return b + c;
-
-      double p = d * ( .3 * 1.5 );
-      double s = p / 4;
-
-      if( t < 1 )
-        return -.5 * ( c * Math.Pow( 2, 10 * ( t -= 1 ) ) * Math.Sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) ) + b;
-      return c * Math.Pow( 2, -10 * ( t -= 1 ) ) * Math.Sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) * .5 + c + b;
-    }
-
-    #endregion
-
-    #region Expo Equations Methods
-
-    private static double ExpoEaseOutImpl( double t, double b, double c, double d )
-    {
-      return ( t == d ) ? b + c : c * ( -Math.Pow( 2, -10 * t / d ) + 1 ) + b;
-    }
-
-    private static double ExpoEaseInImpl( double t, double b, double c, double d )
-    {
-      return ( t == 0 ) ? b : c * Math.Pow( 2, 10 * ( t / d - 1 ) ) + b;
-    }
-
-    private static double ExpoEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( t == 0 )
-        return b;
-
-      if( t == d )
-        return b + c;
-
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * Math.Pow( 2, 10 * ( t - 1 ) ) + b;
-
-      return c / 2 * ( -Math.Pow( 2, -10 * --t ) + 2 ) + b;
-    }
-
-    #endregion
-
-    #region Linear Equations Methods
-
-    private static double LinearImpl( double t, double b, double c, double d )
-    {
-      return c * ( t / d ) + b;
-    }
-
-    #endregion
-
-    #region Quad Equations Methods
-
-    private static double QuadEaseOutImpl( double t, double b, double c, double d )
-    {
-      return -c * ( t /= d ) * ( t - 2 ) + b;
-    }
-
-    private static double QuadEaseInImpl( double t, double b, double c, double d )
-    {
-      return c * ( t /= d ) * t + b;
-    }
-
-    private static double QuadEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * t * t + b;
-
-      return -c / 2 * ( ( --t ) * ( t - 2 ) - 1 ) + b;
-    }
-
-    #endregion
-
-    #region Quartic Equations Methods
-
-    private static double QuartEaseOutImpl( double t, double b, double c, double d )
-    {
-      return -c * ( ( t = t / d - 1 ) * t * t * t - 1 ) + b;
-    }
-
-    private static double QuartEaseInImpl( double t, double b, double c, double d )
-    {
-      return c * ( t /= d ) * t * t * t + b;
-    }
-
-    private static double QuartEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * t * t * t * t + b;
-
-      return -c / 2 * ( ( t -= 2 ) * t * t * t - 2 ) + b;
-    }
-
-    #endregion
-
-    #region Quintic Equations Methods
-
-    private static double QuintEaseOutImpl( double t, double b, double c, double d )
-    {
-      return c * ( ( t = t / d - 1 ) * t * t * t * t + 1 ) + b;
-    }
-
-    private static double QuintEaseInImpl( double t, double b, double c, double d )
-    {
-      return c * ( t /= d ) * t * t * t * t + b;
-    }
-
-    private static double QuintEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * t * t * t * t * t + b;
-      return c / 2 * ( ( t -= 2 ) * t * t * t * t + 2 ) + b;
-    }
-
-    #endregion
-
-    #region Sine Equations Methods
-
-    private static double SineEaseOutImpl( double t, double b, double c, double d )
-    {
-      return c * Math.Sin( t / d * ( Math.PI / 2 ) ) + b;
-    }
-
-    private static double SineEaseInImpl( double t, double b, double c, double d )
-    {
-      return -c * Math.Cos( t / d * ( Math.PI / 2 ) ) + c + b;
-    }
-
-    private static double SineEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * ( Math.Sin( Math.PI * t / 2 ) ) + b;
-
-      return -c / 2 * ( Math.Cos( Math.PI * --t / 2 ) - 2 ) + b;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
deleted file mode 100644
index 7a3f193e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core.Media
-{
-  /// <summary>
-  /// Contains system colors and configurations that can be used by the control themes.
-  /// 
-  /// Mainly extracted from the registry because theses values are not exposed by the standard .NET API.
-  /// </summary>
-  public static class WindowColors
-  {
-    private static Color? _colorizationMode;
-    private static bool? _colorizationOpaqueBlend;
-
-    /// <summary>
-    /// Relative to the \HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM\ColorizationColor Registry key.
-    /// 
-    /// Gets the window chrome color.
-    /// </summary>
-    public static Color ColorizationColor
-    {
-      get
-      {
-        if( _colorizationMode.HasValue )
-          return _colorizationMode.Value;
-
-        try
-        {
-          _colorizationMode = WindowColors.GetDWMColorValue( "ColorizationColor" );
-        }
-        catch
-        {
-          // If for any reason (for example, a SecurityException for XBAP apps)
-          // we cannot read the value in the registry, fall back on some color.
-          _colorizationMode = Color.FromArgb(255, 175, 175, 175);
-        }
-
-        return _colorizationMode.Value;
-      }
-    }
-
-    /// <summary>
-    /// Relative to the \HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM\ColorizationOpaqueBlend Registry key:
-    /// 
-    /// Gets whether transparency is disabled.
-    /// 
-    /// Returns true if transparency is disabled; false otherwise.
-    /// </summary>
-    public static bool ColorizationOpaqueBlend
-    {
-      get
-      {
-        if( _colorizationOpaqueBlend.HasValue )
-          return _colorizationOpaqueBlend.Value;
-
-        try
-        {
-          _colorizationOpaqueBlend = WindowColors.GetDWMBoolValue( "ColorizationOpaqueBlend" );
-        }
-        catch
-        {
-          // If for any reason (for example, a SecurityException for XBAP apps)
-          // we cannot read the value in the registry, fall back on some color.
-          _colorizationOpaqueBlend = false;
-        }
-
-        return _colorizationOpaqueBlend.Value;
-      }
-    }
-
-    private static int GetDWMIntValue( string keyName )
-    {
-      // This value is not accessible throught the standard WPF API.
-      // We must dig into the registry to get the value.
-      var curUser = Microsoft.Win32.Registry.CurrentUser;
-      var subKey = curUser.CreateSubKey(
-        @"Software\Microsoft\Windows\DWM",
-        Microsoft.Win32.RegistryKeyPermissionCheck.ReadSubTree
-#if VS2008
-        );
-#else
-        ,Microsoft.Win32.RegistryOptions.None );
-#endif
-      return ( int )subKey.GetValue( keyName );
-    }
-
-    private static Color GetDWMColorValue( string keyName )
-    {
-      int value = WindowColors.GetDWMIntValue( keyName );
-        byte[] bytes = BitConverter.GetBytes( value );
-        return new Color()
-        {
-          B = bytes[ 0 ],
-          G = bytes[ 1 ],
-          R = bytes[ 2 ],
-          A = 255
-        };
-    }
-
-    private static bool GetDWMBoolValue( string keyName )
-    {
-      int value = WindowColors.GetDWMIntValue( keyName );
-      return ( value != 0 );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
deleted file mode 100644
index af191752..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class PropertyChangedEventArgs<T> : RoutedEventArgs
-  {
-    #region Constructors
-
-    public PropertyChangedEventArgs( RoutedEvent Event, T oldValue, T newValue )
-      : base()
-    {
-      _oldValue = oldValue;
-      _newValue = newValue;
-      this.RoutedEvent = Event;
-    }
-
-    #endregion
-
-    #region NewValue Property
-
-    public T NewValue
-    {
-      get
-      {
-        return _newValue;
-      }
-    }
-
-    private readonly T _newValue;
-
-    #endregion
-
-    #region OldValue Property
-
-    public T OldValue
-    {
-      get
-      {
-        return _oldValue;
-      }
-    }
-
-    private readonly T _oldValue;
-
-    #endregion
-
-    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
-    {
-      PropertyChangedEventHandler<T> handler = ( PropertyChangedEventHandler<T> )genericHandler;
-      handler( genericTarget, this );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
deleted file mode 100644
index f05278e7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public delegate void PropertyChangedEventHandler<T>( object sender, PropertyChangedEventArgs<T> e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
deleted file mode 100644
index 9a5459f7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class QueryTextFromValueEventArgs : EventArgs
-  {
-    public QueryTextFromValueEventArgs( object value, string text )
-    {
-      m_value = value;
-      m_text = text;
-    }
-
-    #region Value Property
-
-    private object m_value;
-
-    public object Value
-    {
-      get { return m_value; }
-    }
-
-    #endregion Value Property
-
-    #region Text Property
-
-    private string m_text;
-
-    public string Text
-    {
-      get { return m_text; }
-      set { m_text = value; }
-    }
-
-    #endregion Text Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
deleted file mode 100644
index b4c8ea12..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class QueryValueFromTextEventArgs : EventArgs
-  {
-    public QueryValueFromTextEventArgs( string text, object value )
-    {
-      m_text = text;
-      m_value = value;
-    }
-
-    #region Text Property
-
-    private string m_text;
-
-    public string Text
-    {
-      get { return m_text; }
-    }
-
-    #endregion Text Property
-
-    #region Value Property
-
-    private object m_value;
-
-    public object Value
-    {
-      get { return m_value; }
-      set { m_value = value; }
-    }
-
-    #endregion Value Property
-
-    #region HasParsingError Property
-
-    private bool m_hasParsingError;
-
-    public bool HasParsingError
-    {
-      get { return m_hasParsingError; }
-      set { m_hasParsingError = value; }
-    }
-
-    #endregion HasParsingError Property
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
deleted file mode 100644
index 22eed4df..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Collections;
-using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  /// <summary>
-  /// An adorner that can display one and only one UIElement.  
-  /// That element can be a panel, which contains multiple other elements.
-  /// The element is added to the adorner's visual and logical trees, enabling it to 
-  /// particpate in dependency property value inheritance, amongst other things.
-  /// </summary>
-  internal class UIElementAdorner<TElement> : Adorner where TElement : UIElement
-  {
-    #region Fields
-
-    TElement _child = null;
-    double _offsetLeft = 0;
-    double _offsetTop = 0;
-
-    #endregion // Fields
-
-    #region Constructor
-
-    /// <summary>
-    /// Constructor. 
-    /// </summary>
-    /// <param name="adornedElement">The element to which the adorner will be bound.</param>
-    public UIElementAdorner( UIElement adornedElement )
-      : base( adornedElement )
-    {
-    }
-
-    #endregion // Constructor
-
-    #region Public Interface
-
-    #region Child
-
-    /// <summary>
-    /// Gets/sets the child element hosted in the adorner.
-    /// </summary>
-    public TElement Child
-    {
-      get
-      {
-        return _child;
-      }
-      set
-      {
-        if( value == _child )
-          return;
-
-        if( _child != null )
-        {
-          base.RemoveLogicalChild( _child );
-          base.RemoveVisualChild( _child );
-        }
-
-        _child = value;
-
-        if( _child != null )
-        {
-          base.AddLogicalChild( _child );
-          base.AddVisualChild( _child );
-        }
-      }
-    }
-
-    #endregion // Child
-
-    #region GetDesiredTransform
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    /// <param name="transform"></param>
-    /// <returns></returns>
-    public override GeneralTransform GetDesiredTransform( GeneralTransform transform )
-    {
-      GeneralTransformGroup result = new GeneralTransformGroup();
-      result.Children.Add( base.GetDesiredTransform( transform ) );
-      result.Children.Add( new TranslateTransform( _offsetLeft, _offsetTop ) );
-      return result;
-    }
-
-    #endregion // GetDesiredTransform
-
-    #region OffsetLeft
-
-    /// <summary>
-    /// Gets/sets the horizontal offset of the adorner.
-    /// </summary>
-    public double OffsetLeft
-    {
-      get
-      {
-        return _offsetLeft;
-      }
-      set
-      {
-        _offsetLeft = value;
-        UpdateLocation();
-      }
-    }
-
-    #endregion // OffsetLeft
-
-    #region SetOffsets
-
-    /// <summary>
-    /// Updates the location of the adorner in one atomic operation.
-    /// </summary>
-    public void SetOffsets( double left, double top )
-    {
-      _offsetLeft = left;
-      _offsetTop = top;
-      this.UpdateLocation();
-    }
-
-    #endregion // SetOffsets
-
-    #region OffsetTop
-
-    /// <summary>
-    /// Gets/sets the vertical offset of the adorner.
-    /// </summary>
-    public double OffsetTop
-    {
-      get
-      {
-        return _offsetTop;
-      }
-      set
-      {
-        _offsetTop = value;
-        UpdateLocation();
-      }
-    }
-
-    #endregion // OffsetTop
-
-    #endregion // Public Interface
-
-    #region Protected Overrides
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    /// <param name="constraint"></param>
-    /// <returns></returns>
-    protected override Size MeasureOverride( Size constraint )
-    {
-      if( _child == null )
-        return base.MeasureOverride( constraint );
-
-      _child.Measure( constraint );
-      return _child.DesiredSize;
-    }
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    /// <param name="finalSize"></param>
-    /// <returns></returns>
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      if( _child == null )
-        return base.ArrangeOverride( finalSize );
-
-      _child.Arrange( new Rect( finalSize ) );
-      return finalSize;
-    }
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    protected override IEnumerator LogicalChildren
-    {
-      get
-      {
-        ArrayList list = new ArrayList();
-        if( _child != null )
-          list.Add( _child );
-        return list.GetEnumerator();
-      }
-    }
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    protected override Visual GetVisualChild( int index )
-    {
-      return _child;
-    }
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return _child == null ? 0 : 1;
-      }
-    }
-
-    #endregion // Protected Overrides
-
-    #region Private Helpers
-
-    void UpdateLocation()
-    {
-      AdornerLayer adornerLayer = base.Parent as AdornerLayer;
-      if( adornerLayer != null )
-        adornerLayer.Update( base.AdornedElement );
-    }
-
-    #endregion // Private Helpers
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
deleted file mode 100644
index 05be50dc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  static class CalculatorUtilities
-  {
-    public static Calculator.CalculatorButtonType GetCalculatorButtonTypeFromText( string text )
-    {
-      switch( text )
-      {
-        case "0":
-          return Calculator.CalculatorButtonType.Zero;
-        case "1":
-          return Calculator.CalculatorButtonType.One;
-        case "2":
-          return Calculator.CalculatorButtonType.Two;
-        case "3":
-          return Calculator.CalculatorButtonType.Three;
-        case "4":
-          return Calculator.CalculatorButtonType.Four;
-        case "5":
-          return Calculator.CalculatorButtonType.Five;
-        case "6":
-          return Calculator.CalculatorButtonType.Six;
-        case "7":
-          return Calculator.CalculatorButtonType.Seven;
-        case "8":
-          return Calculator.CalculatorButtonType.Eight;
-        case "9":
-          return Calculator.CalculatorButtonType.Nine;
-        case "+":
-          return Calculator.CalculatorButtonType.Add;
-        case "-":
-          return Calculator.CalculatorButtonType.Subtract;
-        case "*":
-          return Calculator.CalculatorButtonType.Multiply;
-        case "/":
-          return Calculator.CalculatorButtonType.Divide;
-        case "%":
-          return Calculator.CalculatorButtonType.Percent;
-        case "\b":
-          return Calculator.CalculatorButtonType.Back;
-        case "\r":
-        case "=":
-          return Calculator.CalculatorButtonType.Equal;
-      }
-
-      //the check for the decimal is not in the switch statement. To help localize we check against the current culture's decimal seperator
-      if( text == CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator )
-        return Calculator.CalculatorButtonType.Decimal;
-
-      //check for the escape key
-      if( text == ( ( char )27 ).ToString() )
-        return Calculator.CalculatorButtonType.Clear;
-
-      return Calculator.CalculatorButtonType.None;
-    }
-
-    public static Button FindButtonByCalculatorButtonType( DependencyObject parent, Calculator.CalculatorButtonType type )
-    {
-      if( parent == null )
-        return null;
-
-      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( parent ); i++ )
-      {
-        var child = VisualTreeHelper.GetChild( parent, i );
-        if( child == null )
-          continue;
-
-        object buttonType = child.GetValue( Button.CommandParameterProperty );
-
-        if( buttonType != null && ( Calculator.CalculatorButtonType )buttonType == type )
-        {
-          return child as Button;
-        }
-        else
-        {
-          var result = FindButtonByCalculatorButtonType( child, type );
-
-          if( result != null )
-            return result;
-        }
-      }
-      return null;
-    }
-
-    public static string GetCalculatorButtonContent( Calculator.CalculatorButtonType type )
-    {
-      string content = string.Empty;
-      switch( type )
-      {
-        case Calculator.CalculatorButtonType.Add:
-          content = "+";
-          break;
-        case Calculator.CalculatorButtonType.Back:
-          content = "Back";
-          break;
-        case Calculator.CalculatorButtonType.Cancel:
-          content = "CE";
-          break;
-        case Calculator.CalculatorButtonType.Clear:
-          content = "C";
-          break;
-        case Calculator.CalculatorButtonType.Decimal:
-          content = CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator;
-          break;
-        case Calculator.CalculatorButtonType.Divide:
-          content = "/";
-          break;
-        case Calculator.CalculatorButtonType.Eight:
-          content = "8";
-          break;
-        case Calculator.CalculatorButtonType.Equal:
-          content = "=";
-          break;
-        case Calculator.CalculatorButtonType.Five:
-          content = "5";
-          break;
-        case Calculator.CalculatorButtonType.Four:
-          content = "4";
-          break;
-        case Calculator.CalculatorButtonType.Fraction:
-          content = "1/x";
-          break;
-        case Calculator.CalculatorButtonType.MAdd:
-          content = "M+";
-          break;
-        case Calculator.CalculatorButtonType.MC:
-          content = "MC";
-          break;
-        case Calculator.CalculatorButtonType.MR:
-          content = "MR";
-          break;
-        case Calculator.CalculatorButtonType.MS:
-          content = "MS";
-          break;
-        case Calculator.CalculatorButtonType.MSub:
-          content = "M-";
-          break;
-        case Calculator.CalculatorButtonType.Multiply:
-          content = "*";
-          break;
-        case Calculator.CalculatorButtonType.Nine:
-          content = "9";
-          break;
-        case Calculator.CalculatorButtonType.None:
-          break;
-        case Calculator.CalculatorButtonType.One:
-          content = "1";
-          break;
-        case Calculator.CalculatorButtonType.Percent:
-          content = "%";
-          break;
-        case Calculator.CalculatorButtonType.Seven:
-          content = "7";
-          break;
-        case Calculator.CalculatorButtonType.Negate:
-          content = "+/-";
-          break;
-        case Calculator.CalculatorButtonType.Six:
-          content = "6";
-          break;
-        case Calculator.CalculatorButtonType.Sqrt:
-          content = "Sqrt";
-          break;
-        case Calculator.CalculatorButtonType.Subtract:
-          content = "-";
-          break;
-        case Calculator.CalculatorButtonType.Three:
-          content = "3";
-          break;
-        case Calculator.CalculatorButtonType.Two:
-          content = "2";
-          break;
-        case Calculator.CalculatorButtonType.Zero:
-          content = "0";
-          break;
-      }
-      return content;
-    }
-
-    public static bool IsDigit( Calculator.CalculatorButtonType buttonType )
-    {
-      switch( buttonType )
-      {
-        case Calculator.CalculatorButtonType.Zero:
-        case Calculator.CalculatorButtonType.One:
-        case Calculator.CalculatorButtonType.Two:
-        case Calculator.CalculatorButtonType.Three:
-        case Calculator.CalculatorButtonType.Four:
-        case Calculator.CalculatorButtonType.Five:
-        case Calculator.CalculatorButtonType.Six:
-        case Calculator.CalculatorButtonType.Seven:
-        case Calculator.CalculatorButtonType.Eight:
-        case Calculator.CalculatorButtonType.Nine:
-        case Calculator.CalculatorButtonType.Decimal:
-          return true;
-        default:
-          return false;
-      }
-    }
-
-    public static bool IsMemory( Calculator.CalculatorButtonType buttonType )
-    {
-      switch( buttonType )
-      {
-        case Calculator.CalculatorButtonType.MAdd:
-        case Calculator.CalculatorButtonType.MC:
-        case Calculator.CalculatorButtonType.MR:
-        case Calculator.CalculatorButtonType.MS:
-        case Calculator.CalculatorButtonType.MSub:
-          return true;
-        default:
-          return false;
-      }
-    }
-
-    public static decimal ParseDecimal( string text )
-    {
-      decimal result; 
-      var success = Decimal.TryParse( text, NumberStyles.Any, CultureInfo.CurrentCulture, out result );
-      return success ? result : decimal.Zero;      
-    }
-
-    public static decimal Add( decimal firstNumber, decimal secondNumber )
-    {
-      return firstNumber + secondNumber;
-    }
-
-    public static decimal Subtract( decimal firstNumber, decimal secondNumber )
-    {
-      return firstNumber - secondNumber;
-    }
-
-    public static decimal Multiply( decimal firstNumber, decimal secondNumber )
-    {
-      return firstNumber * secondNumber;
-    }
-
-    public static decimal Divide( decimal firstNumber, decimal secondNumber )
-    {
-      return firstNumber / secondNumber;
-    }
-
-    public static decimal Percent( decimal firstNumber, decimal secondNumber )
-    {
-      return firstNumber * secondNumber / 100M;
-    }
-
-    public static decimal SquareRoot( decimal operand )
-    {
-      return Convert.ToDecimal( Math.Sqrt( Convert.ToDouble( operand ) ) );
-    }
-
-    public static decimal Fraction( decimal operand )
-    {
-      return 1 / operand;
-    }
-
-    public static decimal Negate( decimal operand )
-    {
-      return operand * -1M;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
deleted file mode 100644
index 48ef9fc9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class ChangeTypeHelper
-  {
-    internal static object ChangeType( object value, Type conversionType, IFormatProvider provider )
-    {
-      if( conversionType == null )
-      {
-        throw new ArgumentNullException( "conversionType" );
-      }
-      if( conversionType == typeof( Guid ) )
-      {
-        return new Guid( value.ToString() );
-      }
-      else if( conversionType == typeof( Guid? ) )
-      {
-        if( value == null )
-          return null;
-        return new Guid( value.ToString() );
-      }
-      else if( conversionType.IsGenericType && conversionType.GetGenericTypeDefinition().Equals( typeof( Nullable<> ) ) )
-      {
-        if( value == null )
-          return null;
-        NullableConverter nullableConverter = new NullableConverter( conversionType );
-        conversionType = nullableConverter.UnderlyingType;
-      }
-
-      return System.Convert.ChangeType( value, conversionType, provider );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
deleted file mode 100644
index c00f05bb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  static class ColorUtilities
-  {
-    public static readonly Dictionary<string, Color> KnownColors = GetKnownColors();
-
-    public static string GetColorName( this Color color )
-    {
-      string colorName = KnownColors.Where( kvp => kvp.Value.Equals( color ) ).Select( kvp => kvp.Key ).FirstOrDefault();
-
-      if( String.IsNullOrEmpty( colorName ) )
-        colorName = color.ToString();
-
-      return colorName;
-    }
-
-    public static string FormatColorString( string stringToFormat, bool isUsingAlphaChannel )
-    {
-      if( !isUsingAlphaChannel && ( stringToFormat.Length == 9 ) )
-        return stringToFormat.Remove( 1, 2 );
-      return stringToFormat;
-    }
-
-    private static Dictionary<string, Color> GetKnownColors()
-    {
-      var colorProperties = typeof( Colors ).GetProperties( BindingFlags.Static | BindingFlags.Public );
-      return colorProperties.ToDictionary( p => p.Name, p => ( Color )p.GetValue( null, null ) );
-    }
-
-    /// <summary>
-    /// Converts an RGB color to an HSV color.
-    /// </summary>
-    /// <param name="r"></param>
-    /// <param name="g"></param>
-    /// <param name="b"></param>
-    /// <returns></returns>
-    public static HsvColor ConvertRgbToHsv( int r, int g, int b )
-    {
-      double delta, min;
-      double h = 0, s, v;
-
-      min = Math.Min( Math.Min( r, g ), b );
-      v = Math.Max( Math.Max( r, g ), b );
-      delta = v - min;
-
-      if( v == 0.0 )
-      {
-        s = 0;
-      }
-      else
-        s = delta / v;
-
-      if( s == 0 )
-        h = 0.0;
-
-      else
-      {
-        if( r == v )
-          h = ( g - b ) / delta;
-        else if( g == v )
-          h = 2 + ( b - r ) / delta;
-        else if( b == v )
-          h = 4 + ( r - g ) / delta;
-
-        h *= 60;
-        if( h < 0.0 )
-          h = h + 360;
-
-      }
-
-      return new HsvColor
-      {
-        H = h,
-        S = s,
-        V = v / 255
-      };
-    }
-
-    /// <summary>
-    ///  Converts an HSV color to an RGB color.
-    /// </summary>
-    /// <param name="h"></param>
-    /// <param name="s"></param>
-    /// <param name="v"></param>
-    /// <returns></returns>
-    public static Color ConvertHsvToRgb( double h, double s, double v )
-    {
-      double r = 0, g = 0, b = 0;
-
-      if( s == 0 )
-      {
-        r = v;
-        g = v;
-        b = v;
-      }
-      else
-      {
-        int i;
-        double f, p, q, t;
-
-        if( h == 360 )
-          h = 0;
-        else
-          h = h / 60;
-
-        i = ( int )Math.Truncate( h );
-        f = h - i;
-
-        p = v * ( 1.0 - s );
-        q = v * ( 1.0 - ( s * f ) );
-        t = v * ( 1.0 - ( s * ( 1.0 - f ) ) );
-
-        switch( i )
-        {
-          case 0:
-            {
-              r = v;
-              g = t;
-              b = p;
-              break;
-            }
-          case 1:
-            {
-              r = q;
-              g = v;
-              b = p;
-              break;
-            }
-          case 2:
-            {
-              r = p;
-              g = v;
-              b = t;
-              break;
-            }
-          case 3:
-            {
-              r = p;
-              g = q;
-              b = v;
-              break;
-            }
-          case 4:
-            {
-              r = t;
-              g = p;
-              b = v;
-              break;
-            }
-          default:
-            {
-              r = v;
-              g = p;
-              b = q;
-              break;
-            }
-        }
-
-      }
-
-      return Color.FromArgb( 255, ( byte )(  Math.Round(r * 255) ), ( byte )(  Math.Round(g * 255) ), ( byte )(  Math.Round(b * 255) ) );
-    }
-
-    /// <summary>
-    /// Generates a list of colors with hues ranging from 0 360 and a saturation and value of 1. 
-    /// </summary>
-    /// <returns></returns>
-    public static List<Color> GenerateHsvSpectrum()
-    {
-      var colorsList = new List<Color>();
-      int hStep = 60;
-
-      for( int h = 0; h < 360; h+= hStep )
-      {
-        colorsList.Add( ColorUtilities.ConvertHsvToRgb( h, 1, 1 ) );
-      }
-
-      colorsList.Add( ColorUtilities.ConvertHsvToRgb( 0, 1, 1 ) );
-
-      return colorsList;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
deleted file mode 100644
index a5ba5140..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  public class ContextMenuUtilities
-  {
-    public static readonly DependencyProperty OpenOnMouseLeftButtonClickProperty = DependencyProperty.RegisterAttached( "OpenOnMouseLeftButtonClick", typeof( bool ), typeof( ContextMenuUtilities ), new FrameworkPropertyMetadata( false, OpenOnMouseLeftButtonClickChanged ) );
-    public static void SetOpenOnMouseLeftButtonClick( FrameworkElement element, bool value )
-    {
-      element.SetValue( OpenOnMouseLeftButtonClickProperty, value );
-    }
-    public static bool GetOpenOnMouseLeftButtonClick( FrameworkElement element )
-    {
-      return ( bool )element.GetValue( OpenOnMouseLeftButtonClickProperty );
-    }
-
-    public static void OpenOnMouseLeftButtonClickChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var control = sender as FrameworkElement;
-      if( control != null )
-      {
-        if( ( bool )e.NewValue )
-        {
-          control.PreviewMouseLeftButtonDown += ContextMenuUtilities.Control_PreviewMouseLeftButtonDown;
-        }
-        else
-        {
-          control.PreviewMouseLeftButtonDown -= ContextMenuUtilities.Control_PreviewMouseLeftButtonDown;
-        }
-      }
-    }
-
-    private static void Control_PreviewMouseLeftButtonDown( object sender, System.Windows.Input.MouseButtonEventArgs e )
-    {
-      var control = sender as FrameworkElement;
-      if( (control != null) && (control.ContextMenu != null) )
-      {
-        // Get PropertyItemBase parent
-        var parent = VisualTreeHelper.GetParent( control );
-        while( parent != null )
-        {
-          var propertyItemBase = parent as PropertyItemBase;
-          if( propertyItemBase != null )
-          {
-            // Set the ContextMenu.DataContext to the PropertyItem associated to the clicked image.
-            control.ContextMenu.DataContext = propertyItemBase;
-            break;
-          }
-          parent = VisualTreeHelper.GetParent( parent );
-        }
-
-        control.ContextMenu.PlacementTarget = control;
-        control.ContextMenu.IsOpen = true;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs
deleted file mode 100644
index 7749a5ea..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class DateTimeUtilities
-  {
-    public static DateTime GetContextNow( DateTimeKind kind )
-    {
-      if( kind == DateTimeKind.Unspecified )
-        return DateTime.SpecifyKind( DateTime.Now, DateTimeKind.Unspecified );
-
-      return ( kind == DateTimeKind.Utc )
-        ? DateTime.UtcNow
-        : DateTime.Now;
-    }
-
-    public static bool IsSameDate( DateTime? date1, DateTime? date2 )
-    {
-      if( date1 == null || date2 == null )
-        return false;
-
-      return ( date1.Value.Date == date2.Value.Date );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
deleted file mode 100644
index f77c43bc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class DoubleHelper
-  {
-    public static bool AreVirtuallyEqual( double d1, double d2 )
-    {
-      if( double.IsPositiveInfinity( d1 ) )
-        return double.IsPositiveInfinity( d2 );
-
-      if( double.IsNegativeInfinity( d1 ) )
-        return double.IsNegativeInfinity( d2 );
-
-      if( IsNaN( d1 ) )
-        return IsNaN( d2 );
-
-      double n = d1 - d2;
-      double d = ( Math.Abs( d1 ) + Math.Abs( d2 ) + 10 ) * 1.0e-15;
-      return ( -d < n ) && ( d > n );
-    }
-
-    public static bool AreVirtuallyEqual( Size s1, Size s2 )
-    {
-      return ( AreVirtuallyEqual( s1.Width, s2.Width )
-          && AreVirtuallyEqual( s1.Height, s2.Height ) );
-    }
-
-    public static bool AreVirtuallyEqual( Point p1, Point p2 )
-    {
-      return ( AreVirtuallyEqual( p1.X, p2.X )
-          && AreVirtuallyEqual( p1.Y, p2.Y ) );
-    }
-
-    public static bool AreVirtuallyEqual( Rect r1, Rect r2 )
-    {
-      return ( AreVirtuallyEqual( r1.TopLeft, r2.TopLeft )
-          && AreVirtuallyEqual( r1.BottomRight, r2.BottomRight ) );
-    }
-
-    public static bool AreVirtuallyEqual( Vector v1, Vector v2 )
-    {
-      return ( AreVirtuallyEqual( v1.X, v2.X )
-          && AreVirtuallyEqual( v1.Y, v2.Y ) );
-    }
-
-    public static bool AreVirtuallyEqual( Segment s1, Segment s2 )
-    {
-      // note: Segment struct already uses "virtually equal" approach
-      return ( s1 == s2 );
-    }
-
-    public static bool IsNaN( double value )
-    {
-      // used reflector to borrow the high performance IsNan function 
-      // from the WPF MS.Internal namespace
-      NanUnion t = new NanUnion();
-      t.DoubleValue = value;
-
-      UInt64 exp = t.UintValue & 0xfff0000000000000;
-      UInt64 man = t.UintValue & 0x000fffffffffffff;
-
-      return ( exp == 0x7ff0000000000000 || exp == 0xfff0000000000000 ) && ( man != 0 );
-    }
-
-    #region NanUnion Nested Types
-
-    [StructLayout( LayoutKind.Explicit )]
-    private struct NanUnion
-    {
-      [FieldOffset( 0 )]
-      internal double DoubleValue;
-      [FieldOffset( 0 )]
-      internal UInt64 UintValue;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
deleted file mode 100644
index 2a6c88cc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class EllipseHelper
-  {
-    public static Point PointOfRadialIntersection( Rect ellipseRect, double angle )
-    {
-      // given by the formula:
-      //
-      // x =  a cos q,
-      // y =  b sin q,
-      //
-      // where a is the elliptical radius along the major axis
-      //       b is the elliptical radius along the minor axis
-      //       q is the central angle from the major axis
-
-      double a = ellipseRect.Width / 2;
-      double b = ellipseRect.Height / 2;
-
-      // since this is WPF, we can assume angle is currently specified in degrees, so convert to radians
-      double q = angle * Math.PI / 180;
-
-      return RectHelper.Center( ellipseRect ) + new Vector( a * Math.Cos( q ), b * Math.Sin( q ) );
-    }
-
-    public static double RadialDistanceFromCenter( Rect ellipseRect, double angle )
-    {
-      // given by the formula:
-      //
-      //              2 2
-      //   2         a b
-      //  r  = -----------------
-      //        2   2     2   2
-      //       a sin q + b cos q
-      //
-      // where a is the elliptical radius along the major axis
-      //       b is the elliptical radius along the minor axis
-      //       q is the central angle from the major axis
-
-      double a = ellipseRect.Width / 2;
-      double b = ellipseRect.Height / 2;
-
-      // since this is WPF, we can assume angle is currently specified in degrees, so convert to radians
-      double q = angle * Math.PI / 180;
-
-      double sinq = Math.Sin( q );
-      double cosq = Math.Cos( q );
-      return Math.Sqrt( ( a * a * b * b ) / ( ( a * a * sinq * sinq ) + ( b * b * cosq * cosq ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
deleted file mode 100644
index 89ff8d8d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Media;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal class FontUtilities
-  {
-    internal static IEnumerable<FontFamily> Families
-    {
-      get
-      {
-#if !VS2008
-        // Workaround for a WPF 4 bug.
-        foreach( FontFamily font in Fonts.SystemFontFamilies )
-        {
-          try
-          {
-            // In WPF 4, this will throw an exception.
-            var throwAcess = font.FamilyNames;
-          }
-          catch 
-          { 
-            // It throws. Go to the next font family.
-            continue;
-          }
-
-          // If it does not throw, return the font.
-          yield return font;
-        }
-#else
-      return Fonts.SystemFontFamilies;
-#endif
-      }
-    }
-
-    internal static IEnumerable<FontWeight> Weights
-    {
-      get
-      {
-        yield return FontWeights.Black;
-        yield return FontWeights.Bold;
-        yield return FontWeights.ExtraBlack;
-        yield return FontWeights.ExtraBold;
-        yield return FontWeights.ExtraLight;
-        yield return FontWeights.Light;
-        yield return FontWeights.Medium;
-        yield return FontWeights.Normal;
-        yield return FontWeights.SemiBold;
-        yield return FontWeights.Thin;
-      }
-    }
-
-    internal static IEnumerable<FontStyle> Styles
-    {
-      get
-      {
-        yield return FontStyles.Italic;
-        yield return FontStyles.Normal;
-      }
-    }
-
-    internal static IEnumerable<FontStretch> Stretches
-    {
-      get
-      {
-        yield return FontStretches.Condensed;
-        yield return FontStretches.Expanded;
-        yield return FontStretches.ExtraCondensed;
-        yield return FontStretches.ExtraExpanded;
-        yield return FontStretches.Normal;
-        yield return FontStretches.SemiCondensed;
-        yield return FontStretches.SemiExpanded;
-        yield return FontStretches.UltraCondensed;
-        yield return FontStretches.UltraExpanded;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
deleted file mode 100644
index de0e4f27..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal sealed class GeneralUtilities : DependencyObject
-  {
-    private GeneralUtilities() { }
-
-    #region StubValue attached property
-
-    internal static readonly DependencyProperty StubValueProperty = DependencyProperty.RegisterAttached(
-      "StubValue",
-      typeof( object ),
-      typeof( GeneralUtilities ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault ) );
-
-    internal static object GetStubValue( DependencyObject obj )
-    {
-      return ( object )obj.GetValue( GeneralUtilities.StubValueProperty );
-    }
-
-    internal static void SetStubValue( DependencyObject obj, object value )
-    {
-      obj.SetValue( GeneralUtilities.StubValueProperty, value );
-    }
-
-    #endregion StubValue attached property
-
-    public static object GetPathValue( object sourceObject, string path )
-    {
-      var targetObj = new GeneralUtilities();
-      BindingOperations.SetBinding( targetObj, GeneralUtilities.StubValueProperty, new Binding( path ) { Source = sourceObject } );
-      object value = GeneralUtilities.GetStubValue( targetObj );
-      BindingOperations.ClearBinding( targetObj, GeneralUtilities.StubValueProperty );
-      return value;
-    }
-
-    public static object GetBindingValue( object sourceObject, Binding binding )
-    {
-      Binding bindingClone = new Binding()
-      {
-        BindsDirectlyToSource = binding.BindsDirectlyToSource,
-        Converter = binding.Converter,
-        ConverterCulture = binding.ConverterCulture,
-        ConverterParameter = binding.ConverterParameter,
-        FallbackValue = binding.FallbackValue,
-        Mode = BindingMode.OneTime, 
-        Path = binding.Path,
-        StringFormat = binding.StringFormat,
-        TargetNullValue = binding.TargetNullValue,
-        XPath = binding.XPath
-      };
-
-      bindingClone.Source = sourceObject;
-
-      var targetObj = new GeneralUtilities();
-      BindingOperations.SetBinding( targetObj, GeneralUtilities.StubValueProperty, bindingClone );
-      object value = GeneralUtilities.GetStubValue( targetObj );
-      BindingOperations.ClearBinding( targetObj, GeneralUtilities.StubValueProperty );
-      return value;
-    }
-
-    internal static bool CanConvertValue( object value, object targetType )
-    {
-      return ( ( value != null )
-              && ( !object.Equals( value.GetType(), targetType ) )
-              && ( !object.Equals( targetType, typeof( object ) ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
deleted file mode 100644
index 9ab3ee99..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal class KeyboardUtilities
-  {
-    internal static bool IsKeyModifyingPopupState( KeyEventArgs e )
-    {
-      return ( ( ( ( Keyboard.Modifiers & ModifierKeys.Alt ) == ModifierKeys.Alt ) && ( ( e.SystemKey == Key.Down ) || ( e.SystemKey == Key.Up ) ) )
-            || ( e.Key == Key.F4 ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
deleted file mode 100644
index c559e02c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal class ListUtilities
-  {
-    internal static Type GetListItemType( Type listType )
-    {
-      Type iListOfT = listType.GetInterfaces().FirstOrDefault(
-        ( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( IList<> ) );
-
-      return ( iListOfT != null )
-        ? iListOfT.GetGenericArguments()[ 0 ]
-        : null;
-    }
-
-    internal static Type GetCollectionItemType( Type colType )
-    {
-      Type iCollectionOfT = null;
-      var isCollectionOfT = colType.IsGenericType && (colType.GetGenericTypeDefinition() == typeof( ICollection<> ) );
-      if( isCollectionOfT )
-      {
-        iCollectionOfT = colType;
-      }
-      else
-      {
-        iCollectionOfT = colType.GetInterfaces().FirstOrDefault(( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( ICollection<> ) );
-      }
-
-      return (iCollectionOfT != null)
-        ? iCollectionOfT.GetGenericArguments()[ 0 ]
-        : null;
-    }
-
-    internal static Type[] GetDictionaryItemsType( Type dictType )
-    {
-      var isDict = dictType.IsGenericType 
-        && ((dictType.GetGenericTypeDefinition() == typeof( Dictionary<,>) ) || (dictType.GetGenericTypeDefinition() == typeof( IDictionary<,>) ));
-
-      return isDict
-        ? new Type[] { dictType.GetGenericArguments()[ 0 ], dictType.GetGenericArguments()[ 1 ] }
-        : null;
-    }
-
-    internal static object CreateEditableKeyValuePair( object key, Type keyType, object value, Type valueType )
-    {
-      var itemType = ListUtilities.CreateEditableKeyValuePairType( keyType, valueType );
-      return Activator.CreateInstance( itemType, key, value );
-    }
-
-    internal static Type CreateEditableKeyValuePairType( Type keyType, Type valueType )
-    {
-      //return an EditableKeyValuePair< TKey, TValue> Type from keyType and valueType
-      var itemGenType = typeof( EditableKeyValuePair<,> );
-      Type[] itemGenTypeArgs = { keyType, valueType };
-      return itemGenType.MakeGenericType( itemGenTypeArgs );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
deleted file mode 100644
index 613a3f09..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class PointHelper
-  {
-    public static double DistanceBetween( Point p1, Point p2 )
-    {
-      return Math.Sqrt( Math.Pow( p1.X - p2.X, 2 ) + Math.Pow( p1.Y - p2.Y, 2 ) );
-    }
-
-    public static Point Empty
-    {
-      get
-      {
-        return new Point( double.NaN, double.NaN );
-      }
-    }
-
-    public static bool IsEmpty( Point point )
-    {
-      return DoubleHelper.IsNaN( point.X ) && DoubleHelper.IsNaN( point.Y );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
deleted file mode 100644
index 510b47c0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class PropertyChangedExt
-  {
-    #region Notify Methods
-
-    public static void Notify<TMember>( 
-      this INotifyPropertyChanged sender,
-      PropertyChangedEventHandler handler, 
-      Expression<Func<TMember>> expression )
-    {
-      if( sender == null )
-        throw new ArgumentNullException( "sender" );
-
-      if( expression == null )
-        throw new ArgumentNullException( "expression" );
-
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      string propertyName = PropertyChangedExt.GetPropertyName( body, sender.GetType() );
-
-      PropertyChangedExt.NotifyCore( sender, handler, propertyName );
-    }
-
-    public static void Notify( this INotifyPropertyChanged sender, PropertyChangedEventHandler handler, string propertyName )
-    {
-      if( sender == null )
-        throw new ArgumentNullException( "sender" );
-
-      if( propertyName == null )
-        throw new ArgumentNullException( "propertyName" );
-
-      ReflectionHelper.ValidatePropertyName( sender, propertyName );
-
-      PropertyChangedExt.NotifyCore( sender, handler, propertyName );
-    }
-
-    private static void NotifyCore( INotifyPropertyChanged sender, PropertyChangedEventHandler handler, string propertyName )
-    {
-      if( handler != null )
-      {
-        handler( sender, new PropertyChangedEventArgs( propertyName ) );
-      }
-    }
-
-    #endregion
-
-    #region PropertyChanged Verification Methods
-
-    internal static bool PropertyChanged( string propertyName, PropertyChangedEventArgs e, bool targetPropertyOnly )
-    {
-      string target = e.PropertyName;
-      if( target == propertyName )
-        return true;
-
-      return ( !targetPropertyOnly )
-          && ( string.IsNullOrEmpty( target ) );
-    }
-
-    internal static bool PropertyChanged<TOwner, TMember>(
-      Expression<Func<TMember>> expression,
-      PropertyChangedEventArgs e,
-      bool targetPropertyOnly )
-    {
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      return PropertyChangedExt.PropertyChanged( body, typeof( TOwner ), e, targetPropertyOnly );
-    }
-
-    internal static bool PropertyChanged<TOwner, TMember>(
-      Expression<Func<TOwner, TMember>> expression,
-      PropertyChangedEventArgs e,
-      bool targetPropertyOnly )
-    {
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      return PropertyChangedExt.PropertyChanged( body, typeof( TOwner ), e, targetPropertyOnly );
-    }
-
-    private static bool PropertyChanged( MemberExpression expression, Type ownerType, PropertyChangedEventArgs e, bool targetPropertyOnly )
-    {
-      var propertyName = PropertyChangedExt.GetPropertyName( expression, ownerType );
-
-      return PropertyChangedExt.PropertyChanged( propertyName, e, targetPropertyOnly );
-    }
-
-    #endregion
-
-    private static string GetPropertyName( MemberExpression expression, Type ownerType )
-    {
-      var targetType = expression.Expression.Type;
-      if( !targetType.IsAssignableFrom( ownerType ) )
-        throw new ArgumentException( "The expression must target a property or field on the appropriate owner.", "expression" );
-
-      return ReflectionHelper.GetPropertyOrFieldName( expression );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
deleted file mode 100644
index 028ad56a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class RectHelper
-  {
-    public static Point Center( Rect rect )
-    {
-      return new Point( rect.Left + rect.Width / 2, rect.Top + rect.Height / 2 );
-    }
-
-    public static Nullable<Point> GetNearestPointOfIntersectionBetweenRectAndSegment( Rect rect, Segment segment, Point point )
-    {
-      Nullable<Point> result = null;
-      double distance = double.PositiveInfinity;
-
-      Segment leftIntersection = segment.Intersection( new Segment( rect.BottomLeft, rect.TopLeft ) );
-      Segment topIntersection = segment.Intersection( new Segment( rect.TopLeft, rect.TopRight ) );
-      Segment rightIntersection = segment.Intersection( new Segment( rect.TopRight, rect.BottomRight ) );
-      Segment bottomIntersection = segment.Intersection( new Segment( rect.BottomRight, rect.BottomLeft ) );
-
-      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, leftIntersection, point );
-      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, topIntersection, point );
-      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, rightIntersection, point );
-      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, bottomIntersection, point );
-
-      return result;
-    }
-
-    public static Rect GetRectCenteredOnPoint( Point center, Size size )
-    {
-      return new Rect( new Point( center.X - size.Width / 2, center.Y - size.Height / 2 ), size );
-    }
-
-    private static void AdjustResultForIntersectionWithSide( ref Nullable<Point> result, ref double distance, Segment intersection, Point point )
-    {
-      if( !intersection.IsEmpty )
-      {
-        if( intersection.Contains( point ) )
-        {
-          distance = 0;
-          result = point;
-          return;
-        }
-
-        double p1Distance = PointHelper.DistanceBetween( point, intersection.P1 );
-        double p2Distance = double.PositiveInfinity;
-        if( !intersection.IsPoint )
-        {
-          p2Distance = PointHelper.DistanceBetween( point, intersection.P2 );
-        }
-
-        if( Math.Min( p1Distance, p2Distance ) < distance )
-        {
-          if( p1Distance < p2Distance )
-          {
-            distance = p1Distance;
-            result = intersection.P1;
-          }
-          else
-          {
-            distance = p2Distance;
-            result = intersection.P2;
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
deleted file mode 100644
index e4b4aa8c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class ReflectionHelper
-  {
-    /// <summary>
-    /// Check the existence of the specified public instance (i.e. non static) property against
-    /// the type of the specified source object. If the property is not defined by the type,
-    /// a debug assertion will fail. Typically used to validate the parameter of a 
-    /// RaisePropertyChanged method.
-    /// </summary>
-    /// <param name="sourceObject">The object for which the type will be checked.</param>
-    /// <param name="propertyName">The name of the property.</param>
-    [System.Diagnostics.Conditional( "DEBUG" )]
-    internal static void ValidatePublicPropertyName( object sourceObject, string propertyName )
-    {
-      if( sourceObject == null )
-        throw new ArgumentNullException( "sourceObject" );
-
-      if( propertyName == null )
-        throw new ArgumentNullException( "propertyName" );
-
-      System.Diagnostics.Debug.Assert( sourceObject.GetType().GetProperty( propertyName, System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public ) != null,
-        string.Format( "Public property {0} not found on object of type {1}.", propertyName, sourceObject.GetType().FullName ) );
-    }
-
-    /// <summary>
-    /// Check the existence of the specified instance (i.e. non static) property against
-    /// the type of the specified source object. If the property is not defined by the type,
-    /// a debug assertion will fail. Typically used to validate the parameter of a 
-    /// RaisePropertyChanged method.
-    /// </summary>
-    /// <param name="sourceObject">The object for which the type will be checked.</param>
-    /// <param name="propertyName">The name of the property.</param>
-    [System.Diagnostics.Conditional( "DEBUG" )]
-    internal static void ValidatePropertyName( object sourceObject, string propertyName )
-    {
-      if( sourceObject == null )
-        throw new ArgumentNullException( "sourceObject" );
-
-      if( propertyName == null )
-        throw new ArgumentNullException( "propertyName" );
-
-      System.Diagnostics.Debug.Assert( sourceObject.GetType().GetProperty( propertyName, System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic ) != null,
-        string.Format( "Public property {0} not found on object of type {1}.", propertyName, sourceObject.GetType().FullName ) );
-    }
-
-    internal static bool TryGetEnumDescriptionAttributeValue( Enum enumeration, out string description )
-    {
-      try
-      {
-        FieldInfo fieldInfo = enumeration.GetType().GetField( enumeration.ToString() );
-        DescriptionAttribute[] attributes = fieldInfo.GetCustomAttributes( typeof( DescriptionAttribute ), true ) as DescriptionAttribute[];
-        if( ( attributes != null ) && ( attributes.Length > 0 ) )
-        {
-          description = attributes[ 0 ].Description;
-          return true;
-        }
-      }
-      catch
-      {
-      }
-
-      description = String.Empty;
-      return false;
-    }
-
-    [DebuggerStepThrough]
-    internal static string GetPropertyOrFieldName( MemberExpression expression )
-    {
-      string propertyOrFieldName;
-      if( !ReflectionHelper.TryGetPropertyOrFieldName( expression, out propertyOrFieldName ) )
-        throw new InvalidOperationException( "Unable to retrieve the property or field name." );
-
-      return propertyOrFieldName;
-    }
-
-    [DebuggerStepThrough]
-    internal static string GetPropertyOrFieldName<TMember>( Expression<Func<TMember>> expression )
-    {
-      string propertyOrFieldName;
-      if( !ReflectionHelper.TryGetPropertyOrFieldName( expression, out propertyOrFieldName ) )
-        throw new InvalidOperationException( "Unable to retrieve the property or field name." );
-
-      return propertyOrFieldName;
-    }
-
-    [DebuggerStepThrough]
-    internal static bool TryGetPropertyOrFieldName( MemberExpression expression, out string propertyOrFieldName )
-    {
-      propertyOrFieldName = null;
-
-      if( expression == null )
-        return false;
-
-      propertyOrFieldName = expression.Member.Name;
-
-      return true;
-    }
-
-    [DebuggerStepThrough]
-    internal static bool TryGetPropertyOrFieldName<TMember>( Expression<Func<TMember>> expression, out string propertyOrFieldName )
-    {
-      propertyOrFieldName = null;
-
-      if( expression == null )
-        return false;
-
-      return ReflectionHelper.TryGetPropertyOrFieldName( expression.Body as MemberExpression, out propertyOrFieldName );
-    }
-
-    public static bool IsPublicInstanceProperty( Type type, string propertyName )
-    {
-      BindingFlags flags = ( System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public );
-      return type.GetProperty( propertyName, flags ) != null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
deleted file mode 100644
index 2b80831c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.IO;
-using System.Reflection;
-using System.Resources;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal class ResourceHelper
-  {
-    internal static Stream LoadResourceStream( Assembly assembly, string resId )
-    {
-      string basename = System.IO.Path.GetFileNameWithoutExtension( assembly.ManifestModule.Name ) + ".g";
-      ResourceManager resourceManager = new ResourceManager( basename, assembly );
-
-      // resource names are lower case and contain only forward slashes
-      resId = resId.ToLower();
-      resId = resId.Replace( '\\', '/' );
-      return ( resourceManager.GetObject( resId ) as Stream );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
deleted file mode 100644
index 7467beb3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class RoutedEventHelper
-  {
-    internal static void RaiseEvent( DependencyObject target, RoutedEventArgs args )
-    {
-      if( target is UIElement )
-      {
-        ( target as UIElement ).RaiseEvent( args );
-      }
-      else if( target is ContentElement )
-      {
-        ( target as ContentElement ).RaiseEvent( args );
-      }
-    }
-
-    internal static void AddHandler( DependencyObject element, RoutedEvent routedEvent, Delegate handler )
-    {
-      UIElement uie = element as UIElement;
-      if( uie != null )
-      {
-        uie.AddHandler( routedEvent, handler );
-      }
-      else
-      {
-        ContentElement ce = element as ContentElement;
-        if( ce != null )
-        {
-          ce.AddHandler( routedEvent, handler );
-        }
-      }
-    }
-
-    internal static void RemoveHandler( DependencyObject element, RoutedEvent routedEvent, Delegate handler )
-    {
-      UIElement uie = element as UIElement;
-      if( uie != null )
-      {
-        uie.RemoveHandler( routedEvent, handler );
-      }
-      else
-      {
-        ContentElement ce = element as ContentElement;
-        if( ce != null )
-        {
-          ce.RemoveHandler( routedEvent, handler );
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
deleted file mode 100644
index bf01e59e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
+++ /dev/null
@@ -1,384 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal struct Segment
-  {
-    #region Constructors
-
-    public Segment( Point point )
-    {
-      _p1 = point;
-      _p2 = point;
-      _isP1Excluded = false;
-      _isP2Excluded = false;
-    }
-
-    public Segment( Point p1, Point p2 )
-    {
-      _p1 = p1;
-      _p2 = p2;
-      _isP1Excluded = false;
-      _isP2Excluded = false;
-    }
-
-    public Segment( Point p1, Point p2, bool excludeP1, bool excludeP2 )
-    {
-      _p1 = p1;
-      _p2 = p2;
-      _isP1Excluded = excludeP1;
-      _isP2Excluded = excludeP2;
-    }
-
-    #endregion
-
-    #region Empty Static Properties
-
-    public static Segment Empty
-    {
-      get
-      {
-        Segment result = new Segment( new Point( 0, 0 ) );
-        result._isP1Excluded = true;
-        result._isP2Excluded = true;
-        return result;
-      }
-    }
-
-    #endregion
-
-    #region P1 Property
-
-    public Point P1
-    {
-      get
-      {
-        return _p1;
-      }
-    }
-
-    #endregion
-
-    #region P2 Property
-
-    public Point P2
-    {
-      get
-      {
-        return _p2;
-      }
-    }
-
-    #endregion
-
-    #region IsP1Excluded Property
-
-    public bool IsP1Excluded
-    {
-      get
-      {
-        return _isP1Excluded;
-      }
-    }
-
-    #endregion
-
-    #region IsP2Excluded Property
-
-    public bool IsP2Excluded
-    {
-      get
-      {
-        return _isP2Excluded;
-      }
-    }
-
-    #endregion
-
-    #region IsEmpty Property
-
-    public bool IsEmpty
-    {
-      get
-      {
-        return DoubleHelper.AreVirtuallyEqual( _p1, _p2 ) && ( _isP1Excluded || _isP2Excluded );
-      }
-    }
-
-    #endregion
-
-    #region IsPoint Property
-
-    public bool IsPoint
-    {
-      get
-      {
-        return DoubleHelper.AreVirtuallyEqual( _p1, _p2 );
-      }
-    }
-
-    #endregion
-
-    #region Length Property
-
-    public double Length
-    {
-      get
-      {
-        return ( this.P2 - this.P1 ).Length;
-      }
-    }
-
-    #endregion
-
-    #region Slope Property
-
-    public double Slope
-    {
-      get
-      {
-        return ( this.P2.X == this.P1.X ) ? double.NaN : ( this.P2.Y - this.P1.Y ) / ( this.P2.X - this.P1.X );
-      }
-    }
-
-    #endregion
-
-    public bool Contains( Point point )
-    {
-      if( IsEmpty )
-        return false;
-
-      // if the point is an endpoint, ensure that it is not excluded
-      if( DoubleHelper.AreVirtuallyEqual( _p1, point ) )
-        return _isP1Excluded;
-
-      if( DoubleHelper.AreVirtuallyEqual( _p2, point ) )
-        return _isP2Excluded;
-
-      bool result = false;
-
-      // ensure that a line through P1 and the point is parallel to the current segment
-      if( DoubleHelper.AreVirtuallyEqual( Slope, new Segment( _p1, point ).Slope ) )
-      {
-        // finally, ensure that the point is between the segment's endpoints
-        result = ( point.X >= Math.Min( _p1.X, _p2.X ) )
-              && ( point.X <= Math.Max( _p1.X, _p2.X ) )
-              && ( point.Y >= Math.Min( _p1.Y, _p2.Y ) )
-              && ( point.Y <= Math.Max( _p1.Y, _p2.Y ) );
-      }
-      return result;
-    }
-
-    public bool Contains( Segment segment )
-    {
-      return ( segment == this.Intersection( segment ) );
-    }
-
-    public override bool Equals( object o )
-    {
-      if( !( o is Segment ) )
-        return false;
-
-      Segment other = ( Segment )o;
-
-      // empty segments are always considered equal
-      if( this.IsEmpty )
-        return other.IsEmpty;
-
-      // segments are considered equal if
-      //    1) the endpoints are equal and equally excluded
-      //    2) the opposing endpoints are equal and equally excluded
-      if( DoubleHelper.AreVirtuallyEqual( _p1, other._p1 ) )
-      {
-        return ( DoubleHelper.AreVirtuallyEqual( _p2, other._p2 )
-             && _isP1Excluded == other._isP1Excluded
-             && _isP2Excluded == other._isP2Excluded );
-      }
-      else
-      {
-        return ( DoubleHelper.AreVirtuallyEqual( _p1, other._p2 )
-             && DoubleHelper.AreVirtuallyEqual( _p2, other._p1 )
-             && _isP1Excluded == other._isP2Excluded
-             && _isP2Excluded == other._isP1Excluded );
-      }
-    }
-
-    public override int GetHashCode()
-    {
-      return _p1.GetHashCode() ^ _p2.GetHashCode() ^ _isP1Excluded.GetHashCode() ^ _isP2Excluded.GetHashCode();
-    }
-
-    public Segment Intersection( Segment segment )
-    {
-      // if either segment is empty, the intersection is also empty
-      if( this.IsEmpty || segment.IsEmpty )
-        return Segment.Empty;
-
-      // if the segments are equal, just return a new equal segment
-      if( this == segment )
-        return new Segment( this._p1, this._p2, this._isP1Excluded, this._isP2Excluded );
-
-      // if either segment is a Point, just see if the point is contained in the other segment
-      if( this.IsPoint )
-        return segment.Contains( this._p1 ) ? new Segment( this._p1 ) : Segment.Empty;
-
-      if( segment.IsPoint )
-        return this.Contains( segment._p1 ) ? new Segment( segment._p1 ) : Segment.Empty;
-
-      // okay, no easy answer, so let's do the math...
-      Point p1 = this._p1;
-      Vector v1 = this._p2 - this._p1;
-      Point p2 = segment._p1;
-      Vector v2 = segment._p2 - segment._p1;
-      Vector endpointVector = p2 - p1;
-
-      double xProd = Vector.CrossProduct( v1, v2 );
-
-      // if segments are not parallel, then look for intersection on each segment
-      if( !DoubleHelper.AreVirtuallyEqual( Slope, segment.Slope ) )
-      {
-        // check for intersection on other segment
-        double s = ( Vector.CrossProduct( endpointVector, v1 ) ) / xProd;
-        if( s < 0 || s > 1 )
-          return Segment.Empty;
-
-        // check for intersection on this segment
-        s = ( Vector.CrossProduct( endpointVector, v2 ) ) / xProd;
-        if( s < 0 || s > 1 )
-          return Segment.Empty;
-
-        // intersection of segments is a point
-        return new Segment( p1 + s * v1 );
-      }
-
-      // segments are parallel
-      xProd = Vector.CrossProduct( endpointVector, v1 );
-      if( xProd * xProd > 1.0e-06 * v1.LengthSquared * endpointVector.LengthSquared )
-      {
-        // segments do not intersect
-        return Segment.Empty;
-      }
-
-      // intersection is overlapping segment
-      Segment result = new Segment();
-
-      // to determine the overlapping segment, create reference segments where the endpoints are *not* excluded
-      Segment refThis = new Segment( this._p1, this._p2 );
-      Segment refSegment = new Segment( segment._p1, segment._p2 );
-
-      // check whether this segment is contained in the other segment
-      bool includeThisP1 = refSegment.Contains( refThis._p1 );
-      bool includeThisP2 = refSegment.Contains( refThis._p2 );
-      if( includeThisP1 && includeThisP2 )
-      {
-        result._p1 = this._p1;
-        result._p2 = this._p2;
-        result._isP1Excluded = this._isP1Excluded || !segment.Contains( this._p1 );
-        result._isP2Excluded = this._isP2Excluded || !segment.Contains( this._p2 );
-        return result;
-      }
-
-      // check whether the other segment is contained in this segment
-      bool includeSegmentP1 = refThis.Contains( refSegment._p1 );
-      bool includeSegmentP2 = refThis.Contains( refSegment._p2 );
-      if( includeSegmentP1 && includeSegmentP2 )
-      {
-        result._p1 = segment._p1;
-        result._p2 = segment._p2;
-        result._isP1Excluded = segment._isP1Excluded || !this.Contains( segment._p1 );
-        result._isP2Excluded = segment._isP2Excluded || !this.Contains( segment._p2 );
-        return result;
-      }
-
-      // the intersection must include one endpoint from this segment and one endpoint from the other segment
-      if( includeThisP1 )
-      {
-        result._p1 = this._p1;
-        result._isP1Excluded = this._isP1Excluded || !segment.Contains( this._p1 );
-      }
-      else
-      {
-        result._p1 = this._p2;
-        result._isP1Excluded = this._isP2Excluded || !segment.Contains( this._p2 );
-      }
-      if( includeSegmentP1 )
-      {
-        result._p2 = segment._p1;
-        result._isP2Excluded = segment._isP1Excluded || !this.Contains( segment._p1 );
-      }
-      else
-      {
-        result._p2 = segment._p2;
-        result._isP2Excluded = segment._isP2Excluded || !this.Contains( segment._p2 );
-      }
-      return result;
-    }
-
-    public override string ToString()
-    {
-      string s = base.ToString();
-
-      if( this.IsEmpty )
-      {
-        s = s + ": {Empty}";
-      }
-      else if( this.IsPoint )
-      {
-        s = s + ", Point: " + _p1.ToString();
-      }
-      else
-      {
-        s = s + ": " + _p1.ToString() + ( _isP1Excluded ? " (excl)" : " (incl)" )
-            + " to " + _p2.ToString() + ( _isP2Excluded ? " (excl)" : " (incl)" );
-      }
-
-      return s;
-    }
-
-    #region Operators Methods
-
-    public static bool operator ==( Segment s1, Segment s2 )
-    {
-      if( ( object )s1 == null )
-        return ( object )s2 == null;
-
-      if( ( object )s2 == null )
-        return ( object )s1 == null;
-
-      return s1.Equals( s2 );
-    }
-
-    public static bool operator !=( Segment s1, Segment s2 )
-    {
-      return !( s1 == s2 );
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    private bool _isP1Excluded;
-    private bool _isP2Excluded;
-    private Point _p1;
-    private Point _p2;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
deleted file mode 100644
index 28a1720e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Controls.Primitives;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class TreeHelper
-  {
-    /// <summary>
-    /// Tries its best to return the specified element's parent. It will 
-    /// try to find, in this order, the VisualParent, LogicalParent, LogicalTemplatedParent.
-    /// It only works for Visual, FrameworkElement or FrameworkContentElement.
-    /// </summary>
-    /// <param name="element">The element to which to return the parent. It will only 
-    /// work if element is a Visual, a FrameworkElement or a FrameworkContentElement.</param>
-    /// <remarks>If the logical parent is not found (Parent), we check the TemplatedParent
-    /// (see FrameworkElement.Parent documentation). But, we never actually witnessed
-    /// this situation.</remarks>
-    public static DependencyObject GetParent( DependencyObject element )
-    {
-      return TreeHelper.GetParent( element, true );
-    }
-
-    private static DependencyObject GetParent( DependencyObject element, bool recurseIntoPopup )
-    {
-      if( recurseIntoPopup )
-      {
-        // Case 126732 : To correctly detect parent of a popup we must do that exception case
-        Popup popup = element as Popup;
-
-        if( ( popup != null ) && ( popup.PlacementTarget != null ) )
-          return popup.PlacementTarget;
-      }
-
-      Visual visual = element as Visual;
-      DependencyObject parent = ( visual == null ) ? null : VisualTreeHelper.GetParent( visual );
-
-      if( parent == null )
-      {
-        // No Visual parent. Check in the logical tree.
-        FrameworkElement fe = element as FrameworkElement;
-
-        if( fe != null )
-        {
-          parent = fe.Parent;
-
-          if( parent == null )
-          {
-            parent = fe.TemplatedParent;
-          }
-        }
-        else
-        {
-          FrameworkContentElement fce = element as FrameworkContentElement;
-
-          if( fce != null )
-          {
-            parent = fce.Parent;
-
-            if( parent == null )
-            {
-              parent = fce.TemplatedParent;
-            }
-          }
-        }
-      }
-
-      return parent;
-    }
-
-    /// <summary>
-    /// This will search for a parent of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="startingObject">The node where the search begins. This element is not checked.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    public static T FindParent<T>( DependencyObject startingObject ) where T : DependencyObject
-    {
-      return TreeHelper.FindParent<T>( startingObject, false, null );
-    }
-
-    /// <summary>
-    /// This will search for a parent of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="startingObject">The node where the search begins.</param>
-    /// <param name="checkStartingObject">Should the specified startingObject be checked first.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    public static T FindParent<T>( DependencyObject startingObject, bool checkStartingObject ) where T : DependencyObject
-    {
-      return TreeHelper.FindParent<T>( startingObject, checkStartingObject, null );
-    }
-
-    /// <summary>
-    /// This will search for a parent of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="startingObject">The node where the search begins.</param>
-    /// <param name="checkStartingObject">Should the specified startingObject be checked first.</param>
-    /// <param name="additionalCheck">Provide a callback to check additional properties 
-    /// of the found elements. Can be left Null if no additional criteria are needed.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    /// <example>Button button = TreeHelper.FindParent&lt;Button&gt;( this, foundChild => foundChild.Focusable );</example>
-    public static T FindParent<T>( DependencyObject startingObject, bool checkStartingObject, Func<T, bool> additionalCheck ) where T : DependencyObject
-    {
-      T foundElement;
-      DependencyObject parent = ( checkStartingObject ? startingObject : TreeHelper.GetParent( startingObject, true ) );
-
-      while( parent != null )
-      {
-        foundElement = parent as T;
-
-        if( foundElement != null )
-        {
-          if( additionalCheck == null )
-          {
-            return foundElement;
-          }
-          else
-          {
-            if( additionalCheck( foundElement ) )
-              return foundElement;
-          }
-        }
-
-        parent = TreeHelper.GetParent( parent, true );
-      }
-
-      return null;
-    }
-
-    /// <summary>
-    /// This will search for a child of the specified type. The search is performed 
-    /// hierarchically, breadth first (as opposed to depth first).
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="parent">The root of the tree to search for. This element itself is not checked.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    public static T FindChild<T>( DependencyObject parent ) where T : DependencyObject
-    {
-      return TreeHelper.FindChild<T>( parent, null );
-    }
-
-    /// <summary>
-    /// This will search for a child of the specified type. The search is performed 
-    /// hierarchically, breadth first (as opposed to depth first).
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="parent">The root of the tree to search for. This element itself is not checked.</param>
-    /// <param name="additionalCheck">Provide a callback to check additional properties 
-    /// of the found elements. Can be left Null if no additional criteria are needed.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    /// <example>Button button = TreeHelper.FindChild&lt;Button&gt;( this, foundChild => foundChild.Focusable );</example>
-    public static T FindChild<T>( DependencyObject parent, Func<T, bool> additionalCheck ) where T : DependencyObject
-    {
-      int childrenCount = VisualTreeHelper.GetChildrenCount( parent );
-      T child;
-
-      for( int index = 0; index < childrenCount; index++ )
-      {
-        child = VisualTreeHelper.GetChild( parent, index ) as T;
-
-        if( child != null )
-        {
-          if( additionalCheck == null )
-          {
-            return child;
-          }
-          else
-          {
-            if( additionalCheck( child ) )
-              return child;
-          }
-        }
-      }
-
-      for( int index = 0; index < childrenCount; index++ )
-      {
-        child = TreeHelper.FindChild<T>( VisualTreeHelper.GetChild( parent, index ), additionalCheck );
-
-        if( child != null )
-          return child;
-      }
-
-      return null;
-    }
-
-    /// <summary>
-    /// Returns true if the specified element is a child of parent somewhere in the visual 
-    /// tree. This method will work for Visual, FrameworkElement and FrameworkContentElement.
-    /// </summary>
-    /// <param name="element">The element that is potentially a child of the specified parent.</param>
-    /// <param name="parent">The element that is potentially a parent of the specified element.</param>
-    public static bool IsDescendantOf( DependencyObject element, DependencyObject parent )
-    {
-      return TreeHelper.IsDescendantOf( element, parent, true );
-    }
-
-    /// <summary>
-    /// Returns true if the specified element is a child of parent somewhere in the visual 
-    /// tree. This method will work for Visual, FrameworkElement and FrameworkContentElement.
-    /// </summary>
-    /// <param name="element">The element that is potentially a child of the specified parent.</param>
-    /// <param name="parent">The element that is potentially a parent of the specified element.</param>
-    public static bool IsDescendantOf( DependencyObject element, DependencyObject parent, bool recurseIntoPopup )
-    {
-      while( element != null )
-      {
-        if( element == parent )
-          return true;
-
-        element = TreeHelper.GetParent( element, recurseIntoPopup );
-      }
-
-      return false;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
deleted file mode 100644
index 0c67b3ba..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Collections;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  /// <summary>
-  /// This helper class will raise events when a specific
-  /// path value on one or many items changes.
-  /// </summary>
-  internal class ValueChangeHelper : DependencyObject
-  {
-
-    #region Value Property
-    /// <summary>
-    /// This private property serves as the target of a binding that monitors the value of the binding
-    /// of each item in the source.
-    /// </summary>
-    private static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( ValueChangeHelper ), new UIPropertyMetadata( null, OnValueChanged ) );
-    private object Value
-    {
-      get
-      {
-        return ( object )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private static void OnValueChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      ( ( ValueChangeHelper )sender ).RaiseValueChanged();
-    }
-    #endregion
-
-    public event EventHandler ValueChanged;
-
-    #region Constructor
-
-    public ValueChangeHelper(Action changeCallback)
-    {
-      if( changeCallback == null )
-        throw new ArgumentNullException( "changeCallback" );
-
-      this.ValueChanged += ( s, args ) => changeCallback();
-    }
-
-    #endregion
-
-    #region Methods
-
-    public void UpdateValueSource( object sourceItem, string path )
-    {
-      BindingBase binding = null;
-      if( sourceItem != null && path != null )
-      {
-        binding = new Binding( path ) { Source = sourceItem };
-      }
-
-      this.UpdateBinding( binding );
-    }
-
-    public void UpdateValueSource( IEnumerable sourceItems, string path )
-    {
-      BindingBase binding = null;
-      if( sourceItems != null && path != null )
-      {
-        MultiBinding multiBinding = new MultiBinding();
-        multiBinding.Converter = new BlankMultiValueConverter();
-
-        foreach( var item in sourceItems )
-        {
-          multiBinding.Bindings.Add( new Binding( path ) { Source = item } );
-        }
-
-        binding = multiBinding;
-      }
-
-      this.UpdateBinding( binding );
-    }
-
-    private void UpdateBinding( BindingBase binding )
-    {
-      if( binding != null )
-      {
-        BindingOperations.SetBinding( this, ValueChangeHelper.ValueProperty, binding );
-      }
-      else
-      {
-        this.ClearBinding();
-      }
-    }
-
-    private void ClearBinding()
-    {
-      BindingOperations.ClearBinding( this, ValueChangeHelper.ValueProperty );
-    }
-
-    private void RaiseValueChanged()
-    {
-      if( this.ValueChanged != null )
-      {
-        this.ValueChanged( this, EventArgs.Empty );
-      }
-    }
-
-    #endregion
-
-    #region BlankMultiValueConverter private class
-
-    private class BlankMultiValueConverter : IMultiValueConverter
-    {
-      public object Convert( object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-      {
-        // We will not use the result anyway. We just want the change notification to kick in.
-        // Return a new object to have a different value.
-        return new object();
-      }
-
-      public object[] ConvertBack( object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture )
-      {
-        throw new InvalidOperationException();
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
deleted file mode 100644
index b29d30d0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  public static class VisualTreeHelperEx
-  {
-    public static DependencyObject FindAncestorByType( DependencyObject element, Type type, bool specificTypeOnly )
-    {
-      if( element == null )
-        return null;
-
-      if( specificTypeOnly ? ( element.GetType() == type )
-          : ( element.GetType() == type ) || ( element.GetType().IsSubclassOf( type ) ) )
-        return element;
-
-      return VisualTreeHelperEx.FindAncestorByType( VisualTreeHelper.GetParent( element ), type, specificTypeOnly );
-    }
-
-    public static T FindAncestorByType<T>( DependencyObject depObj ) where T : DependencyObject
-    {
-      if( depObj == null )
-      {
-        return default( T );
-      }
-      if( depObj is T )
-      {
-        return ( T )depObj;
-      }
-
-      T parent = default( T );
-
-      parent = VisualTreeHelperEx.FindAncestorByType<T>( VisualTreeHelper.GetParent( depObj ) );
-
-      return parent;
-    }
-
-    public static Visual FindDescendantByName( Visual element, string name )
-    {
-      if( element != null && ( element is FrameworkElement ) && ( element as FrameworkElement ).Name == name )
-        return element;
-
-      Visual foundElement = null;
-      if( element is FrameworkElement )
-        ( element as FrameworkElement ).ApplyTemplate();
-
-      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
-      {
-        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
-        foundElement = VisualTreeHelperEx.FindDescendantByName( visual, name );
-        if( foundElement != null )
-          break;
-      }
-
-      return foundElement;
-    }
-
-    public static Visual FindDescendantByType( Visual element, Type type )
-    {
-      return VisualTreeHelperEx.FindDescendantByType( element, type, true );
-    }
-
-    public static Visual FindDescendantByType( Visual element, Type type, bool specificTypeOnly )
-    {
-      if( element == null )
-        return null;
-
-      if( specificTypeOnly ? ( element.GetType() == type )
-          : ( element.GetType() == type ) || ( element.GetType().IsSubclassOf( type ) ) )
-        return element;
-
-      Visual foundElement = null;
-      if( element is FrameworkElement )
-        ( element as FrameworkElement ).ApplyTemplate();
-
-      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
-      {
-        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
-        foundElement = VisualTreeHelperEx.FindDescendantByType( visual, type, specificTypeOnly );
-        if( foundElement != null )
-          break;
-      }
-
-      return foundElement;
-    }
-
-    public static T FindDescendantByType<T>( Visual element ) where T : Visual
-    {
-      Visual temp = VisualTreeHelperEx.FindDescendantByType( element, typeof( T ) );
-
-      return ( T )temp;
-    }
-
-    public static Visual FindDescendantWithPropertyValue( Visual element,
-        DependencyProperty dp, object value )
-    {
-      if( element == null )
-        return null;
-
-      if( element.GetValue( dp ).Equals( value ) )
-        return element;
-
-      Visual foundElement = null;
-      if( element is FrameworkElement )
-        ( element as FrameworkElement ).ApplyTemplate();
-
-      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
-      {
-        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
-        foundElement = VisualTreeHelperEx.FindDescendantWithPropertyValue( visual, dp, value );
-        if( foundElement != null )
-          break;
-      }
-
-      return foundElement;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
deleted file mode 100644
index 90f32750..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal class WeakEventListener<TArgs> : IWeakEventListener where TArgs : EventArgs
-  {
-    private Action<object,TArgs> _callback;
-
-    public WeakEventListener(Action<object,TArgs> callback)
-    {
-      if( callback == null )
-         throw new ArgumentNullException( "callback" );
-
-      _callback = callback;
-    }
-
-    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      _callback(sender, (TArgs)e);
-      return true;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
deleted file mode 100644
index 580cd09b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal class WindowUtilities
-  {
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
deleted file mode 100644
index 0ae57913..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.ComponentModel;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class VersionResourceDictionary : ResourceDictionary, ISupportInitialize
-  {
-    private int _initializingCount;
-    private string _assemblyName;
-    private string _sourcePath;
-
-
-    public VersionResourceDictionary() { }
-
-    public VersionResourceDictionary(string assemblyName, string sourcePath)
-    {
-      ( ( ISupportInitialize )this ).BeginInit();
-      this.AssemblyName = assemblyName;
-      this.SourcePath = sourcePath;
-      ( ( ISupportInitialize )this ).EndInit();
-    }
-
-    public string AssemblyName
-    {
-      get { return _assemblyName; }
-      set 
-      {
-        this.EnsureInitialization();
-        _assemblyName = value; 
-      }
-    }
-
-    public string SourcePath
-    {
-      get { return _sourcePath; }
-      set 
-      {
-        this.EnsureInitialization();
-        _sourcePath = value; 
-      }
-    }
-
-    private void EnsureInitialization()
-    {
-      if( _initializingCount <= 0 )
-        throw new InvalidOperationException( "VersionResourceDictionary properties can only be set while initializing." );
-    }
-
-    void ISupportInitialize.BeginInit()
-    {
-      base.BeginInit();
-      _initializingCount++;
-    }
-
-    void ISupportInitialize.EndInit()
-    {
-      _initializingCount--;
-      Debug.Assert( _initializingCount >= 0 );
-
-      if( _initializingCount <= 0 )
-      {
-        if( this.Source != null )
-          throw new InvalidOperationException( "Source property cannot be initialized on the VersionResourceDictionary" );
-
-        if( string.IsNullOrEmpty( this.AssemblyName ) || string.IsNullOrEmpty( this.SourcePath ) )
-          throw new InvalidOperationException( "AssemblyName and SourcePath must be set during initialization" );
-
-        //Using an absolute path is necessary in VS2015 for themes different than Windows 8.
-        string uriStr = string.Format( @"pack://application:,,,/{0};v{1};component/{2}", this.AssemblyName, _XceedVersionInfo.Version, this.SourcePath );
-        this.Source = new Uri( uriStr, UriKind.Absolute );
-      }
-
-      base.EndInit();
-    }
-
-
-    private enum InitState
-    {
-      NotInitialized,
-      Initializing,
-      Initialized
-    };
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
deleted file mode 100644
index c07e4186..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
-using System.Collections.Specialized;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  internal class WeakCollectionChangedWrapper : IList, ICollection, INotifyCollectionChanged
-  {
-    private WeakEventListener<NotifyCollectionChangedEventArgs> _innerListListener;
-    private IList _innerList;
-
-    public WeakCollectionChangedWrapper( IList sourceList )
-    {
-      _innerList = sourceList;
-      var notifyList = _innerList as INotifyCollectionChanged;
-      if( notifyList != null )
-      {
-        _innerListListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( OnInnerCollectionChanged );
-        CollectionChangedEventManager.AddListener( notifyList, _innerListListener );
-      }
-    }
-
-    public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-    private void OnInnerCollectionChanged( object sender, NotifyCollectionChangedEventArgs args )
-    {
-      if( this.CollectionChanged != null )
-      {
-        this.CollectionChanged( this, args );
-      }
-    }
-
-    internal void ReleaseEvents()
-    {
-      if( _innerListListener != null )
-      {
-        CollectionChangedEventManager.RemoveListener( ( INotifyCollectionChanged )_innerList, _innerListListener );
-        _innerListListener = null;
-      }
-    }
-
-    #region IList Members
-
-    int IList.Add( object value )
-    {
-      return _innerList.Add( value );
-    }
-
-    void IList.Clear()
-    {
-      _innerList.Clear();
-    }
-
-    bool IList.Contains( object value )
-    {
-      return _innerList.Contains( value );
-    }
-
-    int IList.IndexOf( object value )
-    {
-      return _innerList.IndexOf( value );
-    }
-
-    void IList.Insert( int index, object value )
-    {
-      _innerList.Insert( index, value );
-    }
-
-    bool IList.IsFixedSize
-    {
-      get { return _innerList.IsFixedSize; }
-    }
-
-    bool IList.IsReadOnly
-    {
-      get { return _innerList.IsReadOnly; }
-    }
-
-    void IList.Remove( object value )
-    {
-      _innerList.Remove( value );
-    }
-
-    void IList.RemoveAt( int index )
-    {
-      _innerList.RemoveAt( index );
-    }
-
-    object IList.this[ int index ]
-    {
-      get { return _innerList[ index ]; }
-      set { _innerList[ index ] = value; }
-    }
-    #endregion
-
-    #region ICollection Members
-
-    void ICollection.CopyTo( Array array, int index )
-    {
-      _innerList.CopyTo( array, index );
-    }
-
-    int ICollection.Count
-    {
-      get { return _innerList.Count; }
-    }
-
-    bool ICollection.IsSynchronized
-    {
-      get { return _innerList.IsSynchronized; }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get { return _innerList.SyncRoot; }
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return _innerList.GetEnumerator();
-    }
-
-    #endregion
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
deleted file mode 100644
index 169a40a1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
+++ /dev/null
@@ -1,473 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Primitives;
-#if VS2008
-using Microsoft.Windows.Controls;
-using Microsoft.Windows.Controls.Primitives;
-#endif
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_Calendar, Type = typeof( Calendar ) )]
-  [TemplatePart( Name = PART_TimeUpDown, Type = typeof( TimePicker ) )]
-  public class DateTimePicker : DateTimePickerBase
-  {
-    private const string PART_Calendar = "PART_Calendar";
-    private const string PART_TimeUpDown = "PART_TimeUpDown";
-
-    #region Members
-
-    private Calendar _calendar;
-    private TimePicker _timePicker;
-    private DateTime? _calendarTemporaryDateTime;
-    private DateTime? _calendarIntendedDateTime;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region AutoCloseCalendar
-
-    public static readonly DependencyProperty AutoCloseCalendarProperty = DependencyProperty.Register( "AutoCloseCalendar", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( false ) );
-    public bool AutoCloseCalendar
-    {
-      get
-      {
-        return ( bool )GetValue( AutoCloseCalendarProperty );
-      }
-      set
-      {
-        SetValue( AutoCloseCalendarProperty, value );
-      }
-    }
-
-    #endregion //AutoCloseCalendar
-
-    #region CalendarDisplayMode
-
-    public static readonly DependencyProperty CalendarDisplayModeProperty = DependencyProperty.Register( "CalendarDisplayMode", typeof( CalendarMode )
-      , typeof( DateTimePicker ), new UIPropertyMetadata( CalendarMode.Month ) );
-    public CalendarMode CalendarDisplayMode
-    {
-      get
-      {
-        return (CalendarMode)GetValue( CalendarDisplayModeProperty );
-      }
-      set
-      {
-        SetValue( CalendarDisplayModeProperty, value );
-      }
-    }
-
-    #endregion //CalendarDisplayMode
-
-    #region CalendarWidth
-
-    public static readonly DependencyProperty CalendarWidthProperty = DependencyProperty.Register( "CalendarWidth", typeof( double )
-      , typeof( DateTimePicker ), new UIPropertyMetadata( 178d ) );
-    public double CalendarWidth
-    {
-      get
-      {
-        return ( double )GetValue( CalendarWidthProperty );
-      }
-      set
-      {
-        SetValue( CalendarWidthProperty, value );
-      }
-    }
-
-    #endregion //CalendarWidth
-
-    #region TimeFormat
-
-    public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register( "TimeFormat", typeof( DateTimeFormat ), typeof( DateTimePicker ), new UIPropertyMetadata( DateTimeFormat.ShortTime ) );
-    public DateTimeFormat TimeFormat
-    {
-      get
-      {
-        return ( DateTimeFormat )GetValue( TimeFormatProperty );
-      }
-      set
-      {
-        SetValue( TimeFormatProperty, value );
-      }
-    }
-
-    #endregion //TimeFormat
-
-    #region TimeFormatString
-
-    public static readonly DependencyProperty TimeFormatStringProperty = DependencyProperty.Register( "TimeFormatString", typeof( string ), typeof( DateTimePicker ), new UIPropertyMetadata( default( String ) ), IsTimeFormatStringValid );
-    public string TimeFormatString
-    {
-      get
-      {
-        return ( string )GetValue( TimeFormatStringProperty );
-      }
-      set
-      {
-        SetValue( TimeFormatStringProperty, value );
-      }
-    }
-
-    private static bool IsTimeFormatStringValid(object value)
-    {
-      return DateTimeUpDown.IsFormatStringValid( value );
-    }
-
-    #endregion //TimeFormatString
-
-    #region TimePickerAllowSpin
-
-    public static readonly DependencyProperty TimePickerAllowSpinProperty = DependencyProperty.Register( "TimePickerAllowSpin", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( true ) );
-    public bool TimePickerAllowSpin
-    {
-      get
-      {
-        return (bool)GetValue( TimePickerAllowSpinProperty );
-      }
-      set
-      {
-        SetValue( TimePickerAllowSpinProperty, value );
-      }
-    }
-
-    #endregion //TimePickerAllowSpin
-
-    #region TimePickerShowButtonSpinner
-
-    public static readonly DependencyProperty TimePickerShowButtonSpinnerProperty = DependencyProperty.Register( "TimePickerShowButtonSpinner", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( true ) );
-    public bool TimePickerShowButtonSpinner
-    {
-      get
-      {
-        return (bool)GetValue( TimePickerShowButtonSpinnerProperty );
-      }
-      set
-      {
-        SetValue( TimePickerShowButtonSpinnerProperty, value );
-      }
-    }
-
-    #endregion //TimePickerShowButtonSpinner
-
-    #region TimePickerVisibility
-
-    public static readonly DependencyProperty TimePickerVisibilityProperty = DependencyProperty.Register( "TimePickerVisibility", typeof( Visibility ), typeof( DateTimePicker ), new UIPropertyMetadata( Visibility.Visible ) );
-    public Visibility TimePickerVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( TimePickerVisibilityProperty );
-      }
-      set
-      {
-        SetValue( TimePickerVisibilityProperty, value );
-      }
-    }
-
-    #endregion //TimePickerVisibility
-
-    #region TimeWatermark
-
-    public static readonly DependencyProperty TimeWatermarkProperty = DependencyProperty.Register( "TimeWatermark", typeof( object ), typeof( DateTimePicker ), new UIPropertyMetadata( null ) );
-    public object TimeWatermark
-    {
-      get
-      {
-        return ( object )GetValue( TimeWatermarkProperty );
-      }
-      set
-      {
-        SetValue( TimeWatermarkProperty, value );
-      }
-    }
-
-    #endregion //TimeWatermark
-
-    #region TimeWatermarkTemplate
-
-    public static readonly DependencyProperty TimeWatermarkTemplateProperty = DependencyProperty.Register( "TimeWatermarkTemplate", typeof( DataTemplate ), typeof( DateTimePicker ), new UIPropertyMetadata( null ) );
-    public DataTemplate TimeWatermarkTemplate
-    {
-      get
-      {
-        return ( DataTemplate )GetValue( TimeWatermarkTemplateProperty );
-      }
-      set
-      {
-        SetValue( TimeWatermarkTemplateProperty, value );
-      }
-    }
-
-    #endregion //TimeWatermarkTemplate
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static DateTimePicker()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimePicker ), new FrameworkPropertyMetadata( typeof( DateTimePicker ) ) );
-      UpdateValueOnEnterKeyProperty.OverrideMetadata( typeof( DateTimePicker ), new FrameworkPropertyMetadata( true ) );
-    }
-
-    public DateTimePicker()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _calendar != null )
-        _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
-
-      _calendar = GetTemplateChild( PART_Calendar ) as Calendar;
-
-      if( _calendar != null )
-      {
-        _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
-        _calendar.SelectedDate = Value ?? null;
-        _calendar.DisplayDate = Value ?? this.ContextNow;
-        this.SetBlackOutDates();
-      }
-
-      if( _timePicker != null )
-      {
-        _timePicker.ValueChanged -= this.TimePicker_ValueChanged;
-      }
-      _timePicker = GetTemplateChild( PART_TimeUpDown ) as TimePicker;
-      if( _timePicker != null )
-      {
-        _timePicker.ValueChanged += this.TimePicker_ValueChanged;
-      }
-    }
-
-    protected override void OnPreviewMouseUp( MouseButtonEventArgs e )
-    {
-      if( Mouse.Captured is CalendarItem)
-      {
-        Mouse.Capture( null );
-
-        // Do not close calendar on Year/Month Selection. Close only on Day selection.
-        if( AutoCloseCalendar && (_calendar != null) && ( _calendar.DisplayMode == CalendarMode.Month ) )
-        {
-          ClosePopup( true );
-        }
-      }
-      base.OnPreviewMouseUp( e );
-    }
-
-    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      //The calendar only select the Date part, not the time part.
-      DateTime? newValueDate = (newValue != null) 
-        ? newValue.Value.Date 
-        : (DateTime?)null;
-
-      if( _calendar != null && _calendar.SelectedDate != newValueDate)
-      {
-        _calendar.SelectedDate = newValueDate;
-        _calendar.DisplayDate = newValue.GetValueOrDefault( this.ContextNow );
-      }
-
-      //If we change any part of the datetime without
-      //using the calendar when the actual date is temporary,
-      //clear the temporary value. 
-      if( (_calendar != null) && (_calendarTemporaryDateTime != null) && (newValue != _calendarTemporaryDateTime ))
-      {
-        _calendarTemporaryDateTime = null;
-        _calendarIntendedDateTime = null;
-      }
-
-      base.OnValueChanged( oldValue, newValue );
-    }
-
-    protected override void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      base.OnIsOpenChanged( oldValue, newValue );
-
-      if( !newValue )
-      {
-        _calendarTemporaryDateTime = null;
-        _calendarIntendedDateTime = null;
-      }
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      //if the calendar is open then we don't want to modify the behavior of navigating the calendar control with the Up/Down keys.
-      if( !IsOpen )
-        base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnMaximumChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnMaximumChanged( oldValue, newValue );
-
-      this.SetBlackOutDates();
-    }
-
-    protected override void OnMinimumChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnMinimumChanged( oldValue, newValue );
-
-      this.SetBlackOutDates();
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    protected override void HandleKeyDown( object sender, KeyEventArgs e )
-    {
-      // The base call will handle the Ctrl+Down, Enter and Esc keys
-      // in order to open or close the popup.
-      // Do not close the Calendar if the call is handled
-      // by the TimePicker inside the DateTimePicker template.
-      if( IsOpen
-        && ( _timePicker != null)
-        && _timePicker.IsKeyboardFocusWithin
-        && ( _timePicker.IsOpen || e.Handled ) )
-        return;
-
-      base.HandleKeyDown( sender, e );
-    }
-
-    private void TimePicker_ValueChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
-    {
-      e.Handled = true;
-
-      // if UpdateValueOnEnterKey is true, 
-      // Sync Value on Text only when Enter Key is pressed.
-      if( this.UpdateValueOnEnterKey )
-      {
-        var newTime = e.NewValue as DateTime?;
-        if( newTime != null )
-        {
-          _fireSelectionChangedEvent = false;
-          var currentDate = this.ConvertTextToValue( this.TextBox.Text );
-          var date = currentDate ?? this.ContextNow;
-          var newValue = new DateTime( date.Year, date.Month, date.Day, newTime.Value.Hour, newTime.Value.Minute, newTime.Value.Second, newTime.Value.Millisecond, date.Kind );
-          this.TextBox.Text = newValue.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-          _fireSelectionChangedEvent = true;
-        }
-      }
-    }
-
-    private void Calendar_SelectedDatesChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count > 0 )
-      {
-        var newDate = ( DateTime? )e.AddedItems[ 0 ];
-
-        if( newDate != null )
-        {
-          //The Calendar will always return a date with an "Unspecified" Kind.
-          //Force the expected kind to the value.
-          newDate = DateTime.SpecifyKind( newDate.Value, this.Kind );
-
-          // Only change the year, month, and day part of the value. Keep everything to the last "tick."
-          // "Milliseconds" aren't precise enough. Use a mathematical scheme instead.
-          if( _calendarIntendedDateTime != null )
-          {
-            newDate = newDate.Value.Date + _calendarIntendedDateTime.Value.TimeOfDay;
-            _calendarTemporaryDateTime = null;
-            _calendarIntendedDateTime = null;
-          }
-          else if( Value != null )
-          {
-            newDate = newDate.Value.Date + Value.Value.TimeOfDay;
-          }
-
-          // Always be sure that the time part of the selected value is always 
-          // within the bound of the min max. The time part could be altered
-          // if the calendar's selected date match the Minimum or Maximum date.
-          // Keep in memory the intended time of day, in case that the selected
-          // calendar date is only transitory (browsing the calendar with the keyboard)
-          var limitedDateTime = this.GetClippedMinMaxValue( newDate );
-
-          if( limitedDateTime.Value != newDate.Value )
-          {
-            _calendarTemporaryDateTime = limitedDateTime;
-            _calendarIntendedDateTime = newDate;
-            newDate = limitedDateTime;
-          }
-        }
-
-        if( this.UpdateValueOnEnterKey )
-        {
-          _fireSelectionChangedEvent = false;
-          this.TextBox.Text = newDate.Value.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-          _fireSelectionChangedEvent = true;
-        }
-        else
-        {
-          if( !object.Equals( newDate, Value ) )
-          {
-            this.Value = newDate;
-          }
-        }
-      }
-    }
-
-    protected override void Popup_Opened( object sender, EventArgs e )
-    {
-      base.Popup_Opened( sender, e );
-
-      if( _calendar != null )
-        _calendar.Focus();
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void SetBlackOutDates()
-    {
-      if( _calendar != null )
-      {
-        _calendar.BlackoutDates.Clear();
-
-        if( ( this.Minimum != null ) && this.Minimum.HasValue && ( this.Minimum.Value != DateTime.MinValue ) )
-        {
-          DateTime minDate = this.Minimum.Value;
-          _calendar.BlackoutDates.Add( new CalendarDateRange( DateTime.MinValue, minDate.AddDays( -1 ) ) );
-        }
-        if( ( this.Maximum != null ) && this.Maximum.HasValue && ( this.Maximum.Value != DateTime.MaxValue ) )
-        {
-          DateTime maxDate = this.Maximum.Value;
-          _calendar.BlackoutDates.Add( new CalendarDateRange( maxDate.AddDays( 1 ), DateTime.MaxValue ) );
-        }
-      }
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 6334e716..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,275 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:toolkit="http://schemas.microsoft.com/wpf/2008/toolkit"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                    Focusable="False"
-                    Margin="0,0,3,0" />
-  </DataTemplate>
-
-  <Style x:Key="DateTimePickerToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                 CornerRadius="0"
-                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                 RenderPressed="{TemplateBinding IsPressed}" />
-
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter HorizontalAlignment="Stretch"
-                                  VerticalAlignment="Stretch"
-                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-
-  <!-- =============================================================================== -->
-  <!-- DateTimePicker                                                                  -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:DateTimePicker}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="TimeWatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="CalendarWidth"
-            Value="178" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
-          <Border>
-            <Grid>
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <local:ButtonSpinner x:Name="PART_Spinner"
-                                     IsTabStop="False"
-                                     Background="{TemplateBinding Background}"
-                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                     ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                     HorizontalContentAlignment="Stretch"
-                                     VerticalContentAlignment="Stretch"
-                                     AllowSpin="{TemplateBinding AllowSpin}"
-                                     ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                  <local:WatermarkTextBox x:Name="PART_TextBox"
-                                          BorderThickness="0"
-                                          Background="Transparent"
-                                          FontFamily="{TemplateBinding FontFamily}"
-                                          FontSize="{TemplateBinding FontSize}"
-                                          FontStretch="{TemplateBinding FontStretch}"
-                                          FontStyle="{TemplateBinding FontStyle}"
-                                          FontWeight="{TemplateBinding FontWeight}"
-                                          Foreground="{TemplateBinding Foreground}"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                          IsTabStop="True"
-                                          MinWidth="20"
-                                          AcceptsReturn="False"
-                                          Padding="{TemplateBinding Padding}"
-                                          TextAlignment="{TemplateBinding TextAlignment}"
-                                          TextWrapping="NoWrap"
-                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                          TabIndex="{TemplateBinding TabIndex}"
-                                          Watermark="{TemplateBinding Watermark}"
-                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-                </local:ButtonSpinner>
-                <ToggleButton x:Name="_calendarToggleButton"
-                              Grid.Column="1"
-                              Background="White"
-                              Focusable="False"
-                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                              Style="{StaticResource DateTimePickerToggleButtonStyle}"
-                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                              IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                              Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}">
-                </ToggleButton>
-              </Grid>
-              <Popup x:Name="PART_Popup"
-                     IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}"
-                     StaysOpen="False"
-                     ToolTip="{x:Static sys:String.Empty}">
-                <Popup.Resources>
-                  <Style TargetType="ToolTip">
-                    <Style.Triggers>
-                      <Trigger Property="Content"
-                               Value="{x:Static sys:String.Empty}">
-                        <Setter Property="Visibility"
-                                Value="Collapsed" />
-                      </Trigger>
-                    </Style.Triggers>
-                  </Style>
-                </Popup.Resources>
-                <Border BorderThickness="1"
-                        Background="{StaticResource PanelBackgroundBrush}"
-                        BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                        Padding="3">
-                  <StackPanel>
-                    <toolkit:Calendar x:Name="PART_Calendar"
-                                      BorderThickness="0"
-                                      DisplayMode="{Binding CalendarDisplayMode, RelativeSource={RelativeSource TemplatedParent}}">
-                      <toolkit:Calendar.Template>
-                        <ControlTemplate TargetType="{x:Type toolkit:Calendar}">
-                          <Viewbox Width="{Binding CalendarWidth, RelativeSource={RelativeSource AncestorType={x:Type local:DateTimePicker}}}">
-                            <StackPanel x:Name="PART_Root"
-                                        HorizontalAlignment="Center">
-                              <toolkit:CalendarItem x:Name="PART_CalendarItem"
-                                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                                    Background="{TemplateBinding Background}"
-                                                    Style="{TemplateBinding CalendarItemStyle}" />
-                            </StackPanel>
-                          </Viewbox>
-                        </ControlTemplate>
-                      </toolkit:Calendar.Template>
-                    </toolkit:Calendar>
-                    <local:TimePicker x:Name="PART_TimeUpDown"
-                                      Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
-                                      Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"
-                                      Format="{TemplateBinding TimeFormat}"
-                                      FormatString="{TemplateBinding TimeFormatString}"
-                                      Kind="{Binding Kind, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}}"
-                                      ClipValueToMinMax="{Binding ClipValueToMinMax, RelativeSource={RelativeSource TemplatedParent}}"
-                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                      AllowSpin="{TemplateBinding TimePickerAllowSpin}"
-                                      Step="{TemplateBinding Step}"
-                                      ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}"
-                                      Watermark="{TemplateBinding TimeWatermark}"
-                                      WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"
-                                      Visibility="{TemplateBinding TimePickerVisibility}" />
-                  </StackPanel>
-                </Border>
-              </Popup>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <Trigger Property="IsKeyboardFocusWithin"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsFocused"
-                     Value="True">
-              <Setter TargetName="PART_TextBox"
-                      Property="FocusManager.FocusedElement"
-                      Value="{Binding ElementName=PART_TextBox}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
deleted file mode 100644
index d2e08202..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
+++ /dev/null
@@ -1,283 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:toolkit="http://schemas.microsoft.com/wpf/2008/toolkit"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="Gray"
-                    Focusable="False"
-                    Margin="0,0,3,0" />
-  </DataTemplate>
-
-  <LinearGradientBrush x:Key="PopupDarkBorderBrush"
-                       EndPoint="0.5,1"
-                       StartPoint="0.5,0">
-    <GradientStop Color="#FFA3AEB9"
-                  Offset="0" />
-    <GradientStop Color="#FF8399A9"
-                  Offset="0.375" />
-    <GradientStop Color="#FF718597"
-                  Offset="0.375" />
-    <GradientStop Color="#FF617584"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <Style x:Key="DateTimePickerToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                 CornerRadius="0,2.75,2.75,0"
-                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                 RenderPressed="{TemplateBinding IsPressed}" />
-
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter HorizontalAlignment="Stretch"
-                                  VerticalAlignment="Stretch"
-                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- =============================================================================== -->
-  <!-- DateTimePicker                                                                  -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:DateTimePicker}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="TimeWatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="CalendarWidth"
-            Value="178" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
-          <Border>
-            <Grid>
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <local:ButtonSpinner x:Name="PART_Spinner"
-                                     IsTabStop="False"
-                                     Background="{TemplateBinding Background}"
-                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                     ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                     HorizontalContentAlignment="Stretch"
-                                     VerticalContentAlignment="Stretch"
-                                     AllowSpin="{TemplateBinding AllowSpin}"
-                                     ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                  <local:WatermarkTextBox x:Name="PART_TextBox"
-                                          BorderThickness="0"
-                                          Background="Transparent"
-                                          FontFamily="{TemplateBinding FontFamily}"
-                                          FontSize="{TemplateBinding FontSize}"
-                                          FontStretch="{TemplateBinding FontStretch}"
-                                          FontStyle="{TemplateBinding FontStyle}"
-                                          FontWeight="{TemplateBinding FontWeight}"
-                                          Foreground="{TemplateBinding Foreground}"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                          IsTabStop="True"
-                                          MinWidth="20"
-                                          AcceptsReturn="False"
-                                          Padding="{TemplateBinding Padding}"
-                                          TextAlignment="{TemplateBinding TextAlignment}"
-                                          TextWrapping="NoWrap"
-                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                          TabIndex="{TemplateBinding TabIndex}"
-                                          Watermark="{TemplateBinding Watermark}"
-                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-                </local:ButtonSpinner>
-                <ToggleButton x:Name="_calendarToggleButton"
-                              Grid.Column="1"
-                              Background="White"
-                              Focusable="False"
-                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                              Style="{StaticResource DateTimePickerToggleButtonStyle}"
-                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                              IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                              Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}">
-                </ToggleButton>
-              </Grid>
-              <Popup x:Name="PART_Popup"
-                     IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}"
-                     StaysOpen="False"
-                     ToolTip="{x:Static sys:String.Empty}">
-                <Popup.Resources>
-                  <Style TargetType="ToolTip">
-                    <Style.Triggers>
-                      <Trigger Property="Content"
-                               Value="{x:Static sys:String.Empty}">
-                        <Setter Property="Visibility"
-                                Value="Collapsed" />
-                      </Trigger>
-                    </Style.Triggers>
-                  </Style>
-                </Popup.Resources>
-                <Border BorderThickness="1"
-                        Background="{StaticResource PopupBackgroundBrush}"
-                        BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                        Padding="3">
-                  <StackPanel>
-                    <toolkit:Calendar x:Name="PART_Calendar"
-                                      BorderThickness="0"
-                                      DisplayMode="{Binding CalendarDisplayMode, RelativeSource={RelativeSource TemplatedParent}}">
-                      <toolkit:Calendar.Template>
-                        <ControlTemplate TargetType="{x:Type toolkit:Calendar}">
-                          <Viewbox Width="{Binding CalendarWidth, RelativeSource={RelativeSource AncestorType={x:Type local:DateTimePicker}}}">
-                            <StackPanel x:Name="PART_Root"
-                                        HorizontalAlignment="Center">
-                              <toolkit:CalendarItem x:Name="PART_CalendarItem"
-                                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                                    Background="{TemplateBinding Background}"
-                                                    Style="{TemplateBinding CalendarItemStyle}" />
-                            </StackPanel>
-                          </Viewbox>
-                        </ControlTemplate>
-                      </toolkit:Calendar.Template>
-                    </toolkit:Calendar>
-                    <local:TimePicker x:Name="PART_TimeUpDown"
-                                      Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
-                                      Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"
-                                      Format="{TemplateBinding TimeFormat}"
-                                      FormatString="{TemplateBinding TimeFormatString}"
-                                      Kind="{Binding Kind, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}}"
-                                      ClipValueToMinMax="{Binding ClipValueToMinMax, RelativeSource={RelativeSource TemplatedParent}}"
-                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                      AllowSpin="{TemplateBinding TimePickerAllowSpin}"
-                                      Step="{TemplateBinding Step}"
-                                      ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}"
-                                      Watermark="{TemplateBinding TimeWatermark}"
-                                      WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"
-                                      Visibility="{TemplateBinding TimePickerVisibility}" />
-                  </StackPanel>
-                </Border>
-              </Popup>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
deleted file mode 100644
index b5bba325..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum DateTimeFormat
-  {
-    Custom,
-    FullDateTime,
-    LongDate,
-    LongTime,
-    MonthDay,
-    RFC1123,
-    ShortDate,
-    ShortTime,
-    SortableDateTime,
-    UniversalSortableDateTime,
-    YearMonth
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
deleted file mode 100644
index 9f17e145..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class DateTimeInfo
-  {
-    public string Content
-    {
-      get;
-      set;
-    }
-    public string Format
-    {
-      get;
-      set;
-    }
-    public bool IsReadOnly
-    {
-      get;
-      set;
-    }
-    public int Length
-    {
-      get;
-      set;
-    }
-    public int StartPosition
-    {
-      get;
-      set;
-    }
-    public DateTimePart Type
-    {
-      get;
-      set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
deleted file mode 100644
index 60cf05cc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class DateTimeParser
-  {
-    public static bool TryParse( string value, string format, DateTime currentDate, CultureInfo cultureInfo, out DateTime result )
-    {
-      bool success = false;
-      result = currentDate;
-
-      if( string.IsNullOrEmpty( value ) || string.IsNullOrEmpty( format ) )
-        return false;
-
-      var dateTimeString = ComputeDateTimeString( value, format, currentDate, cultureInfo ).Trim();
-
-      if( !String.IsNullOrEmpty( dateTimeString ) )
-        success = DateTime.TryParse( dateTimeString, cultureInfo.DateTimeFormat, DateTimeStyles.None, out result );
-
-      if( !success )
-        result = currentDate;
-
-      return success;
-    }
-
-    private static string ComputeDateTimeString( string dateTime, string format, DateTime currentDate, CultureInfo cultureInfo )
-    {
-      Dictionary<string, string> dateParts = GetDateParts( currentDate, cultureInfo );
-      string[] timeParts = new string[ 3 ] { currentDate.Hour.ToString(), currentDate.Minute.ToString(), currentDate.Second.ToString() };
-      string millisecondsPart = currentDate.Millisecond.ToString();
-      string designator = "";
-      string[] dateTimeSeparators = new string[] { ",", " ", "-", ".", "/", cultureInfo.DateTimeFormat.DateSeparator, cultureInfo.DateTimeFormat.TimeSeparator };
-
-      UpdateSortableDateTimeString( ref dateTime, ref format, cultureInfo );
-
-      var dateTimeParts = new List<string>();
-      var formats = new List<string>();
-      var isContainingDateTimeSeparators = dateTimeSeparators.Any( s => dateTime.Contains( s ) );
-      if( isContainingDateTimeSeparators )
-      {
-        dateTimeParts = dateTime.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
-        formats = format.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
-      }
-      else
-      {
-        string currentformat = "";
-        string currentString = "";
-        var formatArray = format.ToCharArray();
-        for( int i = 0; i < formatArray.Count(); ++i )
-        {
-          var c = formatArray[ i ];
-          if( !currentformat.Contains( c ) )
-          {
-            if( !string.IsNullOrEmpty( currentformat ) )
-            {
-              formats.Add( currentformat );
-              dateTimeParts.Add( currentString );
-            }
-            currentformat = c.ToString();
-            currentString = (i < dateTime.Length) ? dateTime[ i ].ToString() : "";
-          }
-          else
-          {
-            currentformat = string.Concat( currentformat, c );
-            currentString = string.Concat( currentString, (i < dateTime.Length) ? dateTime[ i ] : '\0' );
-          }
-        }
-        if( !string.IsNullOrEmpty( currentformat ) )
-        {
-          formats.Add( currentformat );
-          dateTimeParts.Add( currentString );
-        }
-      }
-
-      //Auto-complete missing date parts
-      if( dateTimeParts.Count < formats.Count )
-      {
-        while( dateTimeParts.Count != formats.Count  )
-        {
-          dateTimeParts.Add( "0" );
-        }
-      }
-
-      //something went wrong
-      if( dateTimeParts.Count != formats.Count )
-        return string.Empty;
-
-      for( int i = 0; i < formats.Count; i++ )
-      {
-        var f = formats[ i ];
-        if( !f.Contains( "ddd" ) && !f.Contains( "GMT" ) )
-        {
-          if( f.Contains( "M" ) )
-            dateParts[ "Month" ] = dateTimeParts[ i ];
-          else if( f.Contains( "d" ) )
-            dateParts[ "Day" ] = dateTimeParts[ i ];
-          else if( f.Contains( "y" ) )
-          {
-            dateParts[ "Year" ] = dateTimeParts[ i ] != "0" ? dateTimeParts[ i ] : "0000";
-
-            if( dateParts[ "Year" ].Length == 2 )
-              dateParts[ "Year" ] = string.Format( "{0}{1}", currentDate.Year / 100, dateParts[ "Year" ] );
-          }
-          else if( f.Contains( "h" ) || f.Contains( "H" ) )
-            timeParts[ 0 ] = dateTimeParts[ i ];
-          else if( f.Contains( "m" ) )
-            timeParts[ 1 ] = dateTimeParts[ i ];
-          else if( f.Contains( "s" ) )
-            timeParts[ 2 ] = dateTimeParts[ i ];
-          else if( f.Contains( "f" ) )
-            millisecondsPart = dateTimeParts[ i ];
-          else if( f.Contains( "t" ) )
-            designator = dateTimeParts[ i ];
-        }
-      }
-
-      var date = string.Join( cultureInfo.DateTimeFormat.DateSeparator, dateParts.Select( x => x.Value ).ToArray() );
-      var time = string.Join( cultureInfo.DateTimeFormat.TimeSeparator, timeParts );
-      time += "." + millisecondsPart; 
-
-      return String.Format( "{0} {1} {2}", date, time, designator );
-    }
-
-    private static void UpdateSortableDateTimeString( ref string dateTime, ref string format, CultureInfo cultureInfo )
-    {
-      if( format == cultureInfo.DateTimeFormat.SortableDateTimePattern )
-      {
-        format = format.Replace( "'", "" ).Replace( "T", " " );
-        dateTime = dateTime.Replace( "'", "" ).Replace( "T", " " );
-      }
-      else if( format == cultureInfo.DateTimeFormat.UniversalSortableDateTimePattern )
-      {
-        format = format.Replace( "'", "" ).Replace( "Z", "" );
-        dateTime = dateTime.Replace( "'", "" ).Replace( "Z", "" );
-      }
-    }
-
-    private static Dictionary<string, string> GetDateParts( DateTime currentDate, CultureInfo cultureInfo )
-    {
-      Dictionary<string, string> dateParts = new Dictionary<string, string>();
-      var dateTimeSeparators = new[] { ",", " ", "-", ".", "/", cultureInfo.DateTimeFormat.DateSeparator, cultureInfo.DateTimeFormat.TimeSeparator };
-      var dateFormatParts = cultureInfo.DateTimeFormat.ShortDatePattern.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
-      dateFormatParts.ForEach( item =>
-      {
-        string key = string.Empty;
-        string value = string.Empty;
-
-        if( item.Contains( "M" ) )
-        {
-          key = "Month";
-          value = currentDate.Month.ToString();
-        }
-        else if( item.Contains( "d" ) )
-        {
-          key = "Day";
-          value = currentDate.Day.ToString();
-        }
-        else if( item.Contains( "y" ) )
-        {
-          key = "Year";
-          value = currentDate.Year.ToString("D4");
-        }
-        if( !dateParts.ContainsKey( key ) )
-        {
-          dateParts.Add( key, value );
-        }
-      } );
-      return dateParts;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
deleted file mode 100644
index bc3b660e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum DateTimePart
-  {
-    Day,
-    DayName,
-    AmPmDesignator,
-    Millisecond,
-    Hour12,
-    Hour24,
-    Minute,
-    Month,
-    MonthName,
-    Other,
-    Period,
-    TimeZone,
-    Second,
-    Year
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
deleted file mode 100644
index 344516f9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ /dev/null
@@ -1,963 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class DateTimeUpDown : DateTimeUpDownBase<DateTime?>
-  {
-    #region Members
-
-    private DateTime? _lastValidDate; //null
-    private bool _setKindInternal = false;
-
-    #endregion
-
-    #region Properties
-
-    #region Format
-
-    public static readonly DependencyProperty FormatProperty = DependencyProperty.Register( "Format", typeof( DateTimeFormat ), typeof( DateTimeUpDown ), new UIPropertyMetadata( DateTimeFormat.FullDateTime, OnFormatChanged ) );
-    public DateTimeFormat Format
-    {
-      get
-      {
-        return ( DateTimeFormat )GetValue( FormatProperty );
-      }
-      set
-      {
-        SetValue( FormatProperty, value );
-      }
-    }
-
-    private static void OnFormatChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
-      if( dateTimeUpDown != null )
-        dateTimeUpDown.OnFormatChanged( ( DateTimeFormat )e.OldValue, ( DateTimeFormat )e.NewValue );
-    }
-
-    protected virtual void OnFormatChanged( DateTimeFormat oldValue, DateTimeFormat newValue )
-    {
-      FormatUpdated();
-    }
-
-    #endregion //Format
-
-    #region FormatString
-
-    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( DateTimeUpDown ), new UIPropertyMetadata( default( String ), OnFormatStringChanged ), IsFormatStringValid );
-    public string FormatString
-    {
-      get
-      {
-        return ( string )GetValue( FormatStringProperty );
-      }
-      set
-      {
-        SetValue( FormatStringProperty, value );
-      }
-    }
-
-    internal static bool IsFormatStringValid( object value )
-    {
-      try
-      {
-        // Test the format string if it is used.
-        DateTime.MinValue.ToString( ( string )value, CultureInfo.CurrentCulture );
-      }
-      catch
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
-      if( dateTimeUpDown != null )
-        dateTimeUpDown.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
-    {
-        FormatUpdated();
-    }
-
-    #endregion //FormatString
-
-    #region Kind
-
-    public static readonly DependencyProperty KindProperty = DependencyProperty.Register( "Kind", typeof( DateTimeKind ), typeof( DateTimeUpDown ), 
-      new FrameworkPropertyMetadata( DateTimeKind.Unspecified, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnKindChanged ) );
-    public DateTimeKind Kind
-    {
-      get
-      {
-        return ( DateTimeKind )GetValue( KindProperty );
-      }
-      set
-      {
-        SetValue( KindProperty, value );
-      }
-    }
-
-    private static void OnKindChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
-      if( dateTimeUpDown != null )
-        dateTimeUpDown.OnKindChanged( ( DateTimeKind )e.OldValue, ( DateTimeKind )e.NewValue );
-    }
-
-    protected virtual void OnKindChanged( DateTimeKind oldValue, DateTimeKind newValue )
-    {
-      //Upate the value based on kind. (Postpone to EndInit if not yet initialized)
-      if( !_setKindInternal
-        && this.Value != null 
-        && this.IsInitialized )
-      {
-        this.Value = this.ConvertToKind( this.Value.Value, newValue );
-      }
-    }
-
-    private void SetKindInternal( DateTimeKind kind )
-    {
-      _setKindInternal = true;
-      try
-      {
-#if VS2008
-        // Warning : Binding could be lost
-        this.Kind = kind;
-#else
-        //We use SetCurrentValue to not erase the possible underlying 
-        //OneWay Binding. (This will also update correctly any
-        //possible TwoWay bindings).
-        this.SetCurrentValue( DateTimeUpDown.KindProperty, kind );
-#endif
-      }
-      finally
-      {
-        _setKindInternal = false;
-      }
-    }
-
-    #endregion //Kind
-
-    #region ContextNow (Private)
-
-    internal DateTime ContextNow
-    {
-      get
-      {
-        return DateTimeUtilities.GetContextNow( this.Kind );
-      }
-    }
-
-    #endregion
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static DateTimeUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( typeof( DateTimeUpDown ) ) );
-      MaximumProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( DateTime.MaxValue ) );
-      MinimumProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( DateTime.MinValue ) );
-      UpdateValueOnEnterKeyProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( true ) );
-    }
-
-    public DateTimeUpDown()
-    {
-      this.Loaded += this.DateTimeUpDown_Loaded;
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override bool CommitInput()
-    {
-      bool isSyncValid = this.SyncTextAndValueProperties( true, Text );
-      _lastValidDate = this.Value;
-      return isSyncValid;
-    }
-
-    protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
-    {
-      FormatUpdated();
-    }
-
-    protected override void OnIncrement()
-    {
-      if( this.IsCurrentValueValid() )
-      {
-        this.Increment( this.Step );
-      }
-    }    
-
-    protected override void OnDecrement()
-    {
-      if( this.IsCurrentValueValid() )
-      {
-        this.Increment( -this.Step );
-      }
-    }
-
-    protected override void OnTextChanged( string previousValue, string currentValue )
-    {
-      if( !_processTextChanged )
-        return;
-
-      base.OnTextChanged( previousValue, currentValue );
-    }
-
-    protected override DateTime? ConvertTextToValue( string text )
-    {
-      if( string.IsNullOrEmpty( text ) )
-        return null;
-
-      DateTime result;
-      this.TryParseDateTime( text, out result );
-
-      //Do not force "unspecified" to a time-zone specific
-      //parsed text value. This would result in a lost of precision and
-      //corrupt data. Let the value impose the Kind to the
-      //DateTimePicker. 
-      if( this.Kind != DateTimeKind.Unspecified )
-      {
-
-        //Keep the current kind (Local or Utc) 
-        //by imposing it to the parsed text value.
-        //
-        //Note: A parsed UTC text value may be
-        //      adjusted with a Local kind and time.
-        result = this.ConvertToKind( result, this.Kind );
-      }
-
-      if( this.ClipValueToMinMax )
-      {
-        return this.GetClippedMinMaxValue( result );
-      }
-
-      this.ValidateDefaultMinMax( result );
-
-      return result;
-    }
-
-    protected override string ConvertValueToText()
-    {
-      if( Value == null )
-        return string.Empty;
-
-      return Value.Value.ToString( GetFormatString( Format ), CultureInfo );
-    }
-
-    protected override void SetValidSpinDirection()
-    {
-      ValidSpinDirections validDirections = ValidSpinDirections.None;
-
-      if( !IsReadOnly )
-      {
-        if( this.IsLowerThan( this.Value, this.Maximum ) || !this.Value.HasValue || !this.Maximum.HasValue )
-          validDirections = validDirections | ValidSpinDirections.Increase;
-
-        if( this.IsGreaterThan( this.Value, this.Minimum ) || !this.Value.HasValue || !this.Minimum.HasValue )
-          validDirections = validDirections | ValidSpinDirections.Decrease;
-      }
-
-      if( this.Spinner != null )
-        this.Spinner.ValidSpinDirection = validDirections;
-    }
-
-    protected override object OnCoerceValue( object newValue )
-    {
-      //Since only changing the "kind" of a date
-      //Ex. "2001-01-01 12:00 AM, Kind=Utc" to "2001-01-01 12:00 AM Kind=Local"
-      //by setting the "Value" property won't trigger a property changed,
-      //but will call this callback (coerce), we update the Kind here.
-      DateTime? value = ( DateTime? )base.OnCoerceValue( newValue );
-
-      //Let the initialized determine the final "kind" value.
-      if(value != null && this.IsInitialized)
-      {
-        //Update kind based on value kind
-        this.SetKindInternal( value.Value.Kind );
-      }
-
-      return value;
-    }
-
-    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      DateTimeInfo info = _selectedDateTimeInfo;
-
-      //this only occurs when the user manually type in a value for the Value Property
-      if( info == null )
-        info = (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
-
-        //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
-        //but only if it is not null
-      if( newValue != null )
-        ParseValueIntoDateTimeInfo( this.Value );
-
-      base.OnValueChanged( oldValue, newValue );
-
-      if( !_isTextChangedFromUI )
-      {
-        _lastValidDate = newValue;
-      }
-
-      if( TextBox != null )
-      {
-        //we loose our selection when the Value is set so we need to reselect it without firing the selection changed event
-        _fireSelectionChangedEvent = false;
-        TextBox.Select( info.StartPosition, info.Length );
-        _fireSelectionChangedEvent = true;
-      }
-    }
-
-    protected override bool IsCurrentValueValid()
-    {
-      DateTime result;
-
-      if( string.IsNullOrEmpty( this.TextBox.Text ) )
-        return true;
-
-      return this.TryParseDateTime( this.TextBox.Text, out result );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-      if( this.Value != null )
-      {
-        DateTimeKind valueKind = this.Value.Value.Kind;
-
-        if( valueKind != this.Kind )
-        {
-          //Conflit between "Kind" property and the "Value.Kind" value.
-          //Priority to the one that is not "Unspecified".
-          if( this.Kind == DateTimeKind.Unspecified )
-          {
-            this.SetKindInternal( valueKind );
-          }
-          else
-          {
-            this.Value = this.ConvertToKind( this.Value.Value, this.Kind );
-          }
-        }
-      }
-    }
-
-    protected override void PerformMouseSelection()
-    {
-      if( this.UpdateValueOnEnterKey )
-      {
-        this.ParseValueIntoDateTimeInfo( this.ConvertTextToValue( this.TextBox.Text ) );
-      }
-      base.PerformMouseSelection();
-    }
-
-    protected internal override void PerformKeyboardSelection( int nextSelectionStart )
-    {
-      if( this.UpdateValueOnEnterKey )
-      {
-        this.ParseValueIntoDateTimeInfo( this.ConvertTextToValue( this.TextBox.Text ) );
-      }
-      base.PerformKeyboardSelection( nextSelectionStart );
-    }
-
-    protected override void InitializeDateTimeInfoList( DateTime? value )
-    {
-      _dateTimeInfoList.Clear();
-      _selectedDateTimeInfo = null;
-
-      string format = GetFormatString( Format );
-
-      if( string.IsNullOrEmpty( format ) )
-        return;
-
-      while( format.Length > 0 )
-      {
-        int elementLength = GetElementLengthByFormat( format );
-        DateTimeInfo info = null;
-
-        switch( format[ 0 ] )
-        {
-          case '"':
-          case '\'':
-            {
-              int closingQuotePosition = format.IndexOf( format[ 0 ], 1 );
-              info = new DateTimeInfo
-              {
-                IsReadOnly = true,
-                Type = DateTimePart.Other,
-                Length = 1,
-                Content = format.Substring( 1, Math.Max( 1, closingQuotePosition - 1 ) )
-              };
-              elementLength = Math.Max( 1, closingQuotePosition + 1 );
-              break;
-            }
-          case 'D':
-          case 'd':
-            {
-              string d = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                d = "%" + d;
-
-              if( elementLength > 2 )
-                info = new DateTimeInfo
-                {
-                  IsReadOnly = true,
-                  Type = DateTimePart.DayName,
-                  Length = elementLength,
-                  Format = d
-                };
-              else
-                info = new DateTimeInfo
-                {
-                  IsReadOnly = false,
-                  Type = DateTimePart.Day,
-                  Length = elementLength,
-                  Format = d
-                };
-              break;
-            }
-          case 'F':
-          case 'f':
-            {
-              string f = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                f = "%" + f;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Millisecond,
-                Length = elementLength,
-                Format = f
-              };
-              break;
-            }
-          case 'h':
-            {
-              string h = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                h = "%" + h;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Hour12,
-                Length = elementLength,
-                Format = h
-              };
-              break;
-            }
-          case 'H':
-            {
-              string H = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                H = "%" + H;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Hour24,
-                Length = elementLength,
-                Format = H
-              };
-              break;
-            }
-          case 'M':
-            {
-              string M = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                M = "%" + M;
-
-              if( elementLength >= 3 )
-                info = new DateTimeInfo
-                {
-                  IsReadOnly = false,
-                  Type = DateTimePart.MonthName,
-                  Length = elementLength,
-                  Format = M
-                };
-              else
-                info = new DateTimeInfo
-                {
-                  IsReadOnly = false,
-                  Type = DateTimePart.Month,
-                  Length = elementLength,
-                  Format = M
-                };
-              break;
-            }
-          case 'S':
-          case 's':
-            {
-              string s = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                s = "%" + s;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Second,
-                Length = elementLength,
-                Format = s
-              };
-              break;
-            }
-          case 'T':
-          case 't':
-            {
-              string t = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                t = "%" + t;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.AmPmDesignator,
-                Length = elementLength,
-                Format = t
-              };
-              break;
-            }
-          case 'Y':
-          case 'y':
-            {
-              string y = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                y = "%" + y;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Year,
-                Length = elementLength,
-                Format = y
-              };
-              break;
-            }
-          case '\\':
-            {
-              if( format.Length >= 2 )
-              {
-                info = new DateTimeInfo
-                {
-                  IsReadOnly = true,
-                  Content = format.Substring( 1, 1 ),
-                  Length = 1,
-                  Type = DateTimePart.Other
-                };
-                elementLength = 2;
-              }
-              break;
-            }
-          case 'g':
-            {
-              string g = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                g = "%" + g;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = true,
-                Type = DateTimePart.Period,
-                Length = elementLength,
-                Format = format.Substring( 0, elementLength )
-              };
-              break;
-            }
-          case 'm':
-            {
-              string m = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                m = "%" + m;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Minute,
-                Length = elementLength,
-                Format = m
-              };
-              break;
-            }
-          case 'z':
-            {
-              string z = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                z = "%" + z;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = true,
-                Type = DateTimePart.TimeZone,
-                Length = elementLength,
-                Format = z
-              };
-              break;
-            }
-          default:
-            {
-              elementLength = 1;
-              info = new DateTimeInfo
-              {
-                IsReadOnly = true,
-                Length = 1,
-                Content = format[ 0 ].ToString(),
-                Type = DateTimePart.Other
-              };
-              break;
-            }
-        }
-
-        _dateTimeInfoList.Add( info );
-        format = format.Substring( elementLength );
-      }
-    }
-
-    protected override bool IsLowerThan( DateTime? value1, DateTime? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return (value1.Value < value2.Value);
-    }
-
-    protected override bool IsGreaterThan( DateTime? value1, DateTime? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return (value1.Value > value2.Value);
-    }
-
-    protected override void OnUpdateValueOnEnterKeyChanged( bool oldValue, bool newValue )
-    {
-      throw new NotSupportedException( "DateTimeUpDown controls do not support modifying UpdateValueOnEnterKey property." );
-    }
-
-
-#endregion //Base Class Overrides
-
-    #region Methods
-
-    public void SelectAll()
-    {
-      _fireSelectionChangedEvent = false;
-      TextBox.SelectAll();
-      _fireSelectionChangedEvent = true;
-    }
-
-    private void FormatUpdated()
-    {
-      InitializeDateTimeInfoList( this.Value );
-      if( Value != null )
-        ParseValueIntoDateTimeInfo( this.Value );
-
-      // Update the Text representation of the value.
-      _processTextChanged = false;
-
-      this.SyncTextAndValueProperties( false, null );
-
-      _processTextChanged = true;
-
-    }
-
-    private static int GetElementLengthByFormat( string format )
-    {
-      for( int i = 1; i < format.Length; i++ )
-      {
-        if( String.Compare( format[ i ].ToString(), format[ 0 ].ToString(), false ) != 0 )
-        {
-          return i;
-        }
-      }
-      return format.Length;
-    }
-
-    private void Increment( int step )
-    {
-      _fireSelectionChangedEvent = false;
-
-      var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-      if( currentValue.HasValue )
-      {
-        var newValue = this.UpdateDateTime( currentValue, step );
-        this.TextBox.Text = newValue.Value.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-      }
-      else
-      {
-        this.TextBox.Text = ( this.DefaultValue != null )
-                            ? this.DefaultValue.Value.ToString( this.GetFormatString( this.Format ), this.CultureInfo )
-                            : this.ContextNow.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-      }
-
-      if( this.TextBox != null )
-      {
-        DateTimeInfo info = _selectedDateTimeInfo;
-        //this only occurs when the user manually type in a value for the Value Property
-        if( info == null )
-          info = ( this.CurrentDateTimePart != DateTimePart.Other ) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
-
-        //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
-        this.ParseValueIntoDateTimeInfo( this.ConvertTextToValue( this.TextBox.Text ) );
-
-        //we loose our selection when the Value is set so we need to reselect it without firing the selection changed event
-        this.TextBox.Select( info.StartPosition, info.Length );
-      }
-      _fireSelectionChangedEvent = true;
-
-      this.SyncTextAndValueProperties( true, Text );
-    }
-
-    private void ParseValueIntoDateTimeInfo( DateTime? newDate )
-    {
-      string text = string.Empty;
-
-      _dateTimeInfoList.ForEach( info =>
-      {
-        if( info.Format == null )
-        {
-          info.StartPosition = text.Length;
-          info.Length = info.Content.Length;
-          text += info.Content;
-        }
-        else if( newDate != null )
-        {
-          DateTime date = newDate.Value;
-          info.StartPosition = text.Length;
-          info.Content = date.ToString( info.Format, CultureInfo.DateTimeFormat );
-          info.Length = info.Content.Length;
-          text += info.Content;
-        }
-      } );
-    }
-
-    internal string GetFormatString( DateTimeFormat dateTimeFormat )
-    {
-      switch( dateTimeFormat )
-      {
-        case DateTimeFormat.ShortDate:
-          return CultureInfo.DateTimeFormat.ShortDatePattern;
-        case DateTimeFormat.LongDate:
-          return CultureInfo.DateTimeFormat.LongDatePattern;
-        case DateTimeFormat.ShortTime:
-          return CultureInfo.DateTimeFormat.ShortTimePattern;
-        case DateTimeFormat.LongTime:
-          return CultureInfo.DateTimeFormat.LongTimePattern;
-        case DateTimeFormat.FullDateTime:
-          return CultureInfo.DateTimeFormat.FullDateTimePattern;
-        case DateTimeFormat.MonthDay:
-          return CultureInfo.DateTimeFormat.MonthDayPattern;
-        case DateTimeFormat.RFC1123:
-          return CultureInfo.DateTimeFormat.RFC1123Pattern;
-        case DateTimeFormat.SortableDateTime:
-          return CultureInfo.DateTimeFormat.SortableDateTimePattern;
-        case DateTimeFormat.UniversalSortableDateTime:
-          return CultureInfo.DateTimeFormat.UniversalSortableDateTimePattern;
-        case DateTimeFormat.YearMonth:
-          return CultureInfo.DateTimeFormat.YearMonthPattern;
-        case DateTimeFormat.Custom:
-          {
-            switch( this.FormatString )
-            {
-              case "d":
-                return CultureInfo.DateTimeFormat.ShortDatePattern;
-              case "t":
-                return CultureInfo.DateTimeFormat.ShortTimePattern;
-              case "T":
-                return CultureInfo.DateTimeFormat.LongTimePattern;
-              case "D":
-                return CultureInfo.DateTimeFormat.LongDatePattern;
-              case "f":
-                return CultureInfo.DateTimeFormat.LongDatePattern + " " + CultureInfo.DateTimeFormat.ShortTimePattern;
-              case "F":
-                return CultureInfo.DateTimeFormat.FullDateTimePattern;
-              case "g":
-                return CultureInfo.DateTimeFormat.ShortDatePattern + " " + CultureInfo.DateTimeFormat.ShortTimePattern;
-              case "G":
-                return CultureInfo.DateTimeFormat.ShortDatePattern + " " + CultureInfo.DateTimeFormat.LongTimePattern;
-              case "m":
-                return CultureInfo.DateTimeFormat.MonthDayPattern;
-              case "y":
-                return CultureInfo.DateTimeFormat.YearMonthPattern;
-              case "r":
-                return CultureInfo.DateTimeFormat.RFC1123Pattern;
-              case "s":
-                return CultureInfo.DateTimeFormat.SortableDateTimePattern;
-              case "u":
-                return CultureInfo.DateTimeFormat.UniversalSortableDateTimePattern;
-              default:
-                return FormatString;
-            }
-          }
-        default:
-          throw new ArgumentException( "Not a supported format" );
-      }
-    }
-
-    private DateTime? UpdateDateTime( DateTime? currentDateTime, int value )
-    {
-      DateTimeInfo info = _selectedDateTimeInfo;
-
-      //this only occurs when the user manually type in a value for the Value Property
-      if( info == null )
-        info = (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
-
-      DateTime? result = null;
-
-      try
-      {
-        switch( info.Type )
-        {
-          case DateTimePart.Year:
-            {
-              result = ( ( DateTime )currentDateTime).AddYears( value );
-              break;
-            }
-          case DateTimePart.Month:
-          case DateTimePart.MonthName:
-            {
-              result = ( ( DateTime )currentDateTime).AddMonths( value );
-              break;
-            }
-          case DateTimePart.Day:
-          case DateTimePart.DayName:
-            {
-              result = ( ( DateTime )currentDateTime).AddDays( value );
-              break;
-            }
-          case DateTimePart.Hour12:
-          case DateTimePart.Hour24:
-            {
-              result = ( ( DateTime )currentDateTime).AddHours( value );
-              break;
-            }
-          case DateTimePart.Minute:
-            {
-              result = ( ( DateTime )currentDateTime).AddMinutes( value );
-              break;
-            }
-          case DateTimePart.Second:
-            {
-              result = ( ( DateTime )currentDateTime).AddSeconds( value );
-              break;
-            }
-          case DateTimePart.Millisecond:
-            {
-              result = ( ( DateTime )currentDateTime).AddMilliseconds( value );
-              break;
-            }
-          case DateTimePart.AmPmDesignator:
-            {
-              result = ( ( DateTime )currentDateTime).AddHours( value * 12 );
-              break;
-            }
-          default:
-            {
-              break;
-            }
-        }
-      }
-      catch
-      {
-        //this can occur if the date/time = 1/1/0001 12:00:00 AM which is the smallest date allowed.
-        //I could write code that would validate the date each and everytime but I think that it would be more
-        //efficient if I just handle the edge case and allow an exeption to occur and swallow it instead.
-      }
-
-      return this.CoerceValueMinMax( result );
-    }
-
-    private bool TryParseDateTime( string text, out DateTime result )
-    {
-      bool isValid = false;
-      result = this.ContextNow;
-
-      DateTime current = this.ContextNow;
-      try
-      {
-        current = (this.Value.HasValue)
-                    ? this.Value.Value
-                    : DateTime.Parse( this.ContextNow.ToString(), this.CultureInfo.DateTimeFormat );
-
-        isValid = DateTimeParser.TryParse( text, this.GetFormatString( Format ), current, this.CultureInfo, out result );
-      }
-      catch( FormatException )
-      {
-        isValid = false;
-      }
-
-      if( !isValid )
-      {
-        isValid = DateTime.TryParseExact( text, this.GetFormatString( this.Format ), this.CultureInfo, DateTimeStyles.None, out result );
-      }
-
-      if( !isValid )
-      {
-        result = ( _lastValidDate != null ) ? _lastValidDate.Value : current;
-      }
-
-      return isValid;
-    }
-
-    private DateTime ConvertToKind( DateTime dateTime, DateTimeKind kind )
-    {
-      //Same kind, just return same value.
-      if( kind == dateTime.Kind )
-        return dateTime;
-
-      //"ToLocalTime()" from an unspecified will assume
-      // That the time was originaly Utc and affect the datetime value. 
-      // Just "Force" the "Kind" instead.
-      if( dateTime.Kind == DateTimeKind.Unspecified 
-        || kind == DateTimeKind.Unspecified )
-        return DateTime.SpecifyKind( dateTime, kind );
-
-      return ( kind == DateTimeKind.Local )
-         ? dateTime.ToLocalTime()
-         : dateTime.ToUniversalTime();
-    }
-
-    #endregion //Methods
-
-    #region Event Handlers
-
-    private void DateTimeUpDown_Loaded( object sender, RoutedEventArgs e )
-    {
-      if( ( this.Format == DateTimeFormat.Custom ) && ( string.IsNullOrEmpty( this.FormatString ) ) )
-      {
-        throw new InvalidOperationException( "A FormatString is necessary when Format is set to Custom." );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index e60fb629..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
-    </DataTemplate>
-
-
-    <!-- =============================================================================== -->
-    <!-- DateTimeUpDown                                                                  -->
-    <!-- =============================================================================== -->
-
-    <Style x:Key="DateTimeUpDown" TargetType="{x:Type local:DateTimeUpDown}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-        <Setter Property="HorizontalContentAlignment" Value="Right" />
-        <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
-                    <local:ButtonSpinner x:Name="PART_Spinner"
-                                    IsTabStop="False"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                    AllowSpin="{TemplateBinding AllowSpin}"
-                                    ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                        <local:WatermarkTextBox x:Name="PART_TextBox"
-                                          BorderThickness="0" 
-                                          Background="Transparent"
-                                          ContextMenu="{TemplateBinding ContextMenu}"
-                                          FontFamily="{TemplateBinding FontFamily}" 
-                                          FontSize="{TemplateBinding FontSize}" 
-                                          FontStretch="{TemplateBinding FontStretch}"
-                                          FontStyle="{TemplateBinding FontStyle}" 
-                                          FontWeight="{TemplateBinding FontWeight}" 
-                                          Foreground="{TemplateBinding Foreground}" 
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                          IsTabStop="True"
-                                          MinWidth="20"
-                                          AcceptsReturn="False"
-                                          Padding="{TemplateBinding Padding}"
-                                          TextAlignment="{TemplateBinding TextAlignment}"
-                                          TextWrapping="NoWrap" 
-                                          TabIndex="{TemplateBinding TabIndex}"
-                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                          Watermark="{TemplateBinding Watermark}"
-                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-                    </local:ButtonSpinner>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-                        </Trigger>
-                     <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                           <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                      Value="False" />
-                           <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                                      Value="False" />
-                        </MultiDataTrigger.Conditions>
-                        <Setter Property="IsReadOnly"
-                                Value="True"
-                                TargetName="PART_TextBox" />
-                     </MultiDataTrigger>
-                     <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                  Value="True">
-                        <Setter Property="IsReadOnly"
-                                Value="True"
-                                TargetName="PART_TextBox" />
-                     </DataTrigger>
-                     <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                          <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
-                      </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:DateTimeUpDown}" BasedOn="{StaticResource DateTimeUpDown}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
deleted file mode 100644
index bae925ff..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-   <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}"
-                      Foreground="Gray"
-                      Focusable="False"
-                      Margin="0,0,3,0" />
-   </DataTemplate>
-
-   <!-- =============================================================================== -->
-   <!-- DateTimeUpDown                                                                  -->
-   <!-- =============================================================================== -->
-
-   <Style x:Key="DateTimeUpDown"
-          TargetType="{x:Type local:DateTimeUpDown}">
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-      <Setter Property="BorderBrush"
-              Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-      <Setter Property="BorderThickness"
-              Value="1" />
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-      <Setter Property="HorizontalContentAlignment"
-              Value="Right" />
-      <Setter Property="IsTabStop"
-              Value="False" />
-      <Setter Property="TextAlignment"
-              Value="Right" />
-      <Setter Property="WatermarkTemplate"
-              Value="{StaticResource DefaultWatermarkTemplate}" />
-      <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
-               <local:ButtonSpinner x:Name="PART_Spinner"
-                                    IsTabStop="False"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                    AllowSpin="{TemplateBinding AllowSpin}"
-                                    ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                  <local:WatermarkTextBox x:Name="PART_TextBox"
-                                          BorderThickness="0"
-                                          Background="Transparent"
-                                          ContextMenu="{TemplateBinding ContextMenu}"
-                                          FontFamily="{TemplateBinding FontFamily}"
-                                          FontSize="{TemplateBinding FontSize}"
-                                          FontStretch="{TemplateBinding FontStretch}"
-                                          FontStyle="{TemplateBinding FontStyle}"
-                                          FontWeight="{TemplateBinding FontWeight}"
-                                          Foreground="{TemplateBinding Foreground}"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                          IsTabStop="True"
-                                          MinWidth="20"
-                                          AcceptsReturn="False"
-                                          Padding="{TemplateBinding Padding}"
-                                          TextAlignment="{TemplateBinding TextAlignment}"
-                                          TextWrapping="NoWrap"
-                                          TabIndex="{TemplateBinding TabIndex}"
-                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                          Watermark="{TemplateBinding Watermark}"
-                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-               </local:ButtonSpinner>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsFocused"
-                           Value="True">
-                     <Setter TargetName="PART_TextBox"
-                             Property="FocusManager.FocusedElement"
-                             Value="{Binding ElementName=PART_TextBox}" />
-                  </Trigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                   Value="False" />
-                        <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                                   Value="False" />
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="IsReadOnly"
-                             Value="True"
-                             TargetName="PART_TextBox" />
-                  </MultiDataTrigger>
-                  <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                               Value="True">
-                     <Setter Property="IsReadOnly"
-                             Value="True"
-                             TargetName="PART_TextBox" />
-                  </DataTrigger>
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-                     <Setter Property="Foreground"
-                             Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style TargetType="{x:Type local:DateTimeUpDown}"
-          BasedOn="{StaticResource DateTimeUpDown}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
deleted file mode 100644
index 11b77e7a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
+++ /dev/null
@@ -1,562 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_DropDownButton, Type = typeof( ToggleButton ) )]
-  [TemplatePart( Name = PART_ContentPresenter, Type = typeof( ContentPresenter ) )]
-  [TemplatePart( Name = PART_Popup, Type = typeof( Popup ) )]
-  public class DropDownButton : ContentControl, ICommandSource
-  {
-    private const string PART_DropDownButton = "PART_DropDownButton";
-    private const string PART_ContentPresenter = "PART_ContentPresenter";
-    private const string PART_Popup = "PART_Popup";
-
-    #region Members 
-
-    private ContentPresenter _contentPresenter;
-    private Popup _popup;
-
-    #endregion
-
-    #region Constructors
-
-    static DropDownButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( DropDownButton ), new FrameworkPropertyMetadata( typeof( DropDownButton ) ) );
-
-      EventManager.RegisterClassHandler( typeof( DropDownButton ), AccessKeyManager.AccessKeyPressedEvent, new AccessKeyPressedEventHandler( OnAccessKeyPressed ) );
-    }
-
-    public DropDownButton()
-    {
-      Keyboard.AddKeyDownHandler( this, OnKeyDown );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    private System.Windows.Controls.Primitives.ButtonBase _button;
-    protected System.Windows.Controls.Primitives.ButtonBase Button
-    {
-      get
-      {
-        return _button;
-      }
-      set
-      {
-        if( _button != null )
-          _button.Click -= DropDownButton_Click;
-
-        _button = value;
-
-        if( _button != null )
-          _button.Click += DropDownButton_Click;
-      }
-    }
-
-    #region DropDownContent
-
-    public static readonly DependencyProperty DropDownContentProperty = DependencyProperty.Register( "DropDownContent", typeof( object ), typeof( DropDownButton ), new UIPropertyMetadata( null, OnDropDownContentChanged ) );
-    public object DropDownContent
-    {
-      get
-      {
-        return ( object )GetValue( DropDownContentProperty );
-      }
-      set
-      {
-        SetValue( DropDownContentProperty, value );
-      }
-    }
-
-    private static void OnDropDownContentChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DropDownButton dropDownButton = o as DropDownButton;
-      if( dropDownButton != null )
-        dropDownButton.OnDropDownContentChanged( ( object )e.OldValue, ( object )e.NewValue );
-    }
-
-    protected virtual void OnDropDownContentChanged( object oldValue, object newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //DropDownContent
-
-    #region DropDownContentBackground
-
-    public static readonly DependencyProperty DropDownContentBackgroundProperty = DependencyProperty.Register( "DropDownContentBackground", typeof( Brush ), typeof( DropDownButton ), new UIPropertyMetadata( null ) );
-    public Brush DropDownContentBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( DropDownContentBackgroundProperty );
-      }
-      set
-      {
-        SetValue( DropDownContentBackgroundProperty, value );
-      }
-    }
-
-    #endregion //DropDownContentBackground
-
-    #region DropDownPosition
-
-    public static readonly DependencyProperty DropDownPositionProperty = DependencyProperty.Register( "DropDownPosition", typeof( PlacementMode )
-      , typeof( DropDownButton ), new UIPropertyMetadata( PlacementMode.Bottom ) );
-    public PlacementMode DropDownPosition
-    {
-      get
-      {
-        return (PlacementMode)GetValue( DropDownPositionProperty );
-      }
-      set
-      {
-        SetValue( DropDownPositionProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsDefault
-
-    public static readonly DependencyProperty IsDefaultProperty = DependencyProperty.Register( "IsDefault", typeof( bool ), typeof( DropDownButton ), new UIPropertyMetadata( false, OnIsDefaultChanged ) );
-    public bool IsDefault
-    {
-      get
-      {
-        return ( bool )GetValue( IsDefaultProperty );
-      }
-      set
-      {
-        SetValue( IsDefaultProperty, value );
-      }
-    }
-
-    private static void OnIsDefaultChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var dropDownButton = o as DropDownButton;
-      if( dropDownButton != null )
-        dropDownButton.OnIsDefaultChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsDefaultChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-      {
-        AccessKeyManager.Register( "\r", this );
-      }
-      else
-      {
-        AccessKeyManager.Unregister( "\r", this );
-      }
-    }
-
-    #endregion //IsDefault
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DropDownButton ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DropDownButton dropDownButton = o as DropDownButton;
-      if( dropDownButton != null )
-        dropDownButton.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-        RaiseRoutedEvent( DropDownButton.OpenedEvent );
-      else
-        RaiseRoutedEvent( DropDownButton.ClosedEvent );
-    }
-
-    #endregion //IsOpen
-
-    #region MaxDropDownHeight
-
-    public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register( "MaxDropDownHeight", typeof( double )
-      , typeof( DropDownButton ), new UIPropertyMetadata( SystemParameters.PrimaryScreenHeight / 2.0, OnMaxDropDownHeightChanged ) );
-    public double MaxDropDownHeight
-    {
-      get
-      {
-        return (double)GetValue( MaxDropDownHeightProperty );
-      }
-      set
-      {
-        SetValue( MaxDropDownHeightProperty, value );
-      }
-    }
-
-    private static void OnMaxDropDownHeightChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var dropDownButton = o as DropDownButton;
-      if( dropDownButton != null )
-        dropDownButton.OnMaxDropDownHeightChanged( (double)e.OldValue, (double)e.NewValue );
-    }
-
-    protected virtual void OnMaxDropDownHeightChanged( double oldValue, double newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion
-
-    #endregion //Properties
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-      this.Button = this.GetTemplateChild( PART_DropDownButton ) as ToggleButton;
-
-      _contentPresenter = GetTemplateChild( PART_ContentPresenter ) as ContentPresenter;
-
-      if( _popup != null )
-        _popup.Opened -= Popup_Opened;
-
-      _popup = GetTemplateChild( PART_Popup ) as Popup;
-
-      if( _popup != null )
-        _popup.Opened += Popup_Opened;
-    }
-
-    protected override void OnIsKeyboardFocusWithinChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnIsKeyboardFocusWithinChanged( e );
-      if( !( bool )e.NewValue )
-      {
-        this.CloseDropDown( false );
-      }
-    }
-
-    protected override void OnGotFocus( RoutedEventArgs e )
-    {
-      base.OnGotFocus( e );
-      if( this.Button != null )
-      {
-        this.Button.Focus();
-      }
-    }
-
-    protected override void OnAccessKey( AccessKeyEventArgs e )
-    {
-      if( e.IsMultiple )
-      {
-        base.OnAccessKey( e );
-      }
-      else
-      {
-        this.OnClick();
-      }
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Events
-
-    public static readonly RoutedEvent ClickEvent = EventManager.RegisterRoutedEvent( "Click", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
-    public event RoutedEventHandler Click
-    {
-      add
-      {
-        AddHandler( ClickEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ClickEvent, value );
-      }
-    }
-
-    public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent( "Opened", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
-    public event RoutedEventHandler Opened
-    {
-      add
-      {
-        AddHandler( OpenedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( OpenedEvent, value );
-      }
-    }
-
-    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent( "Closed", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
-    public event RoutedEventHandler Closed
-    {
-      add
-      {
-        AddHandler( ClosedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ClosedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Event Handlers
-
-    private static void OnAccessKeyPressed( object sender, AccessKeyPressedEventArgs e )
-    {
-      if( !e.Handled && ( e.Scope == null ) && ( e.Target == null ) )
-      {
-        e.Target = sender as DropDownButton;
-      }
-    }
-
-    private void OnKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsOpen = true;
-          // ContentPresenter items will get focus in Popup_Opened().
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          CloseDropDown( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Escape )
-        {
-          CloseDropDown( true );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      CloseDropDown( true );
-    }
-
-    private void DropDownButton_Click( object sender, RoutedEventArgs e )
-    {
-      OnClick();
-    }
-
-    void CanExecuteChanged( object sender, EventArgs e )
-    {
-      CanExecuteChanged();
-    }
-
-    private void Popup_Opened( object sender, EventArgs e )
-    {
-      // Set the focus on the content of the ContentPresenter.
-      if( _contentPresenter != null )
-      {
-        _contentPresenter.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void CanExecuteChanged()
-    {
-      if( Command != null )
-      {
-        RoutedCommand command = Command as RoutedCommand;
-
-        // If a RoutedCommand.
-        if( command != null )
-          IsEnabled = command.CanExecute( CommandParameter, CommandTarget ) ? true : false;
-        // If a not RoutedCommand.
-        else
-          IsEnabled = Command.CanExecute( CommandParameter ) ? true : false;
-      }
-    }
-
-    /// <summary>
-    /// Closes the drop down.
-    /// </summary>
-    private void CloseDropDown( bool isFocusOnButton )
-    {
-      if( IsOpen )
-      {
-        IsOpen = false;
-      }
-      ReleaseMouseCapture();
-
-      if( isFocusOnButton && (this.Button != null) )
-      {
-        Button.Focus();
-      }
-    }
-
-    protected virtual void OnClick()
-    {
-      RaiseRoutedEvent( DropDownButton.ClickEvent );
-      RaiseCommand();
-    }
-
-    /// <summary>
-    /// Raises routed events.
-    /// </summary>
-    private void RaiseRoutedEvent( RoutedEvent routedEvent )
-    {
-      RoutedEventArgs args = new RoutedEventArgs( routedEvent, this );
-      RaiseEvent( args );
-    }
-
-    /// <summary>
-    /// Raises the command's Execute event.
-    /// </summary>
-    private void RaiseCommand()
-    {
-      if( Command != null )
-      {
-        RoutedCommand routedCommand = Command as RoutedCommand;
-
-        if( routedCommand == null )
-          ( ( ICommand )Command ).Execute( CommandParameter );
-        else
-          routedCommand.Execute( CommandParameter, CommandTarget );
-      }
-    }
-
-    /// <summary>
-    /// Unhooks a command from the Command property.
-    /// </summary>
-    /// <param name="oldCommand">The old command.</param>
-    /// <param name="newCommand">The new command.</param>
-    private void UnhookCommand( ICommand oldCommand, ICommand newCommand )
-    {
-      EventHandler handler = CanExecuteChanged;
-      oldCommand.CanExecuteChanged -= handler;
-    }
-
-    /// <summary>
-    /// Hooks up a command to the CanExecuteChnaged event handler.
-    /// </summary>
-    /// <param name="oldCommand">The old command.</param>
-    /// <param name="newCommand">The new command.</param>
-    private void HookUpCommand( ICommand oldCommand, ICommand newCommand )
-    {
-      EventHandler handler = new EventHandler( CanExecuteChanged );
-      canExecuteChangedHandler = handler;
-      if( newCommand != null )
-        newCommand.CanExecuteChanged += canExecuteChangedHandler;
-    }
-
-    #endregion //Methods
-
-    #region ICommandSource Members
-
-    // Keeps a copy of the CanExecuteChnaged handler so it doesn't get garbage collected.
-    private EventHandler canExecuteChangedHandler;
-
-    #region Command
-
-    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( "Command", typeof( ICommand ), typeof( DropDownButton ), new PropertyMetadata( ( ICommand )null, OnCommandChanged ) );
-    [TypeConverter( typeof( CommandConverter ) )]
-    public ICommand Command
-    {
-      get
-      {
-        return ( ICommand )GetValue( CommandProperty );
-      }
-      set
-      {
-        SetValue( CommandProperty, value );
-      }
-    }
-
-    private static void OnCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      DropDownButton dropDownButton = d as DropDownButton;
-      if( dropDownButton != null )
-        dropDownButton.OnCommandChanged( ( ICommand )e.OldValue, ( ICommand )e.NewValue );
-    }
-
-    protected virtual void OnCommandChanged( ICommand oldValue, ICommand newValue )
-    {
-      // If old command is not null, then we need to remove the handlers.
-      if( oldValue != null )
-        UnhookCommand( oldValue, newValue );
-
-      HookUpCommand( oldValue, newValue );
-
-      CanExecuteChanged(); //may need to call this when changing the command parameter or target.
-    }
-
-    #endregion //Command
-
-    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register( "CommandParameter", typeof( object ), typeof( DropDownButton ), new PropertyMetadata( null ) );
-    public object CommandParameter
-    {
-      get
-      {
-        return GetValue( CommandParameterProperty );
-      }
-      set
-      {
-        SetValue( CommandParameterProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register( "CommandTarget", typeof( IInputElement ), typeof( DropDownButton ), new PropertyMetadata( null ) );
-    public IInputElement CommandTarget
-    {
-      get
-      {
-        return ( IInputElement )GetValue( CommandTargetProperty );
-      }
-      set
-      {
-        SetValue( CommandTargetProperty, value );
-      }
-    }
-
-    #endregion //ICommandSource Members
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index f7faa69a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,154 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-
-  <!-- =============================================================================== -->
-  <!-- DropDownButton                                                                  -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:DropDownButton}">
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="DropDownContentBackground"
-            Value="{StaticResource PanelBackgroundBrush}" />
-    <Setter Property="Padding"
-            Value="3" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:DropDownButton}">
-          <Grid x:Name="MainGrid"
-                SnapsToDevicePixels="True">
-            <ToggleButton x:Name="PART_DropDownButton"
-                          Grid.Column="1"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
-              <ToggleButton.Template>
-                <ControlTemplate TargetType="ToggleButton">
-                  <ContentPresenter />
-                </ControlTemplate>
-              </ToggleButton.Template>
-              <Grid>
-                <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                     Background="{TemplateBinding Background}"
-                                     Foreground="{TemplateBinding Foreground}"
-                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                     RenderChecked="{TemplateBinding IsOpen}"
-                                     RenderEnabled="{TemplateBinding IsEnabled}"
-                                     RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
-                                     RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}">
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="*" />
-                      <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <ContentPresenter Margin="{TemplateBinding Padding}"
-                                      Content="{TemplateBinding Content}"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}"
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      RecognizesAccessKey="true" />
-                    <Grid x:Name="arrowGlyph"
-                          IsHitTestVisible="False"
-                          Margin="4,3,4,3"
-                          Grid.Column="1">
-                      <Path x:Name="Arrow"
-                            Width="9"
-                            Height="5"
-                            Data="{StaticResource DownArrowGeometry}"
-                            Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                            Margin="0,1,0,0" />
-                    </Grid>
-                  </Grid>
-                </chrome:ButtonChrome>
-              </Grid>
-            </ToggleButton>
-
-            <Popup x:Name="PART_Popup"
-                   HorizontalOffset="1"
-                   VerticalOffset="1"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   Placement="{TemplateBinding DropDownPosition}"
-                   Focusable="False"
-                   IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{TemplateBinding DropDownContentBackground}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                <ScrollViewer x:Name="DropDownScrollViewer"
-                              VerticalScrollBarVisibility="Auto">
-                  <ContentPresenter x:Name="PART_ContentPresenter"
-                                    Content="{TemplateBinding DropDownContent}" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-              <Setter TargetName="ToggleButtonChrome"
-                      Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
deleted file mode 100644
index a54bfbf6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
+++ /dev/null
@@ -1,174 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <LinearGradientBrush x:Key="PopupDarkBorderBrush"
-                       EndPoint="0.5,1"
-                       StartPoint="0.5,0">
-    <GradientStop Color="#FFA3AEB9"
-                  Offset="0" />
-    <GradientStop Color="#FF8399A9"
-                  Offset="0.375" />
-    <GradientStop Color="#FF718597"
-                  Offset="0.375" />
-    <GradientStop Color="#FF617584"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <Style TargetType="{x:Type local:DropDownButton}">
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="DropDownContentBackground"
-            Value="{StaticResource PopupBackgroundBrush}" />
-    <Setter Property="Padding"
-            Value="3" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:DropDownButton}">
-          <Grid x:Name="MainGrid"
-                SnapsToDevicePixels="True">
-            <ToggleButton x:Name="PART_DropDownButton"
-                          Grid.Column="1"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
-              <ToggleButton.Template>
-                <ControlTemplate TargetType="ToggleButton">
-                  <ContentPresenter />
-                </ControlTemplate>
-              </ToggleButton.Template>
-              <Grid>
-                <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                     Background="{TemplateBinding Background}"
-                                     Foreground="{TemplateBinding Foreground}"
-                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                     CornerRadius="2.75"
-                                     RenderChecked="{TemplateBinding IsOpen}"
-                                     RenderEnabled="{TemplateBinding IsEnabled}"
-                                     RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
-                                     RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}">
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="*" />
-                      <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <ContentPresenter Margin="{TemplateBinding Padding}"
-                                      Content="{TemplateBinding Content}"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}"
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      RecognizesAccessKey="true" />
-                    <Grid x:Name="arrowGlyph"
-                          IsHitTestVisible="False"
-                          Margin="4,3,4,3"
-                          Grid.Column="1">
-                      <Path x:Name="Arrow"
-                            Width="9"
-                            Height="5"
-                            Data="{StaticResource DownArrowGeometry}"
-                            Fill="#FF000000"
-                            Margin="0,1,0,0" />
-                    </Grid>
-                  </Grid>
-                </chrome:ButtonChrome>
-              </Grid>
-            </ToggleButton>
-
-            <Popup x:Name="PART_Popup"
-                   HorizontalOffset="1"
-                   VerticalOffset="1"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   Placement="{TemplateBinding DropDownPosition}"
-                   Focusable="False"
-                   IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{TemplateBinding DropDownContentBackground}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                <ScrollViewer x:Name="DropDownScrollViewer"
-                              VerticalScrollBarVisibility="Auto">
-                  <ContentPresenter x:Name="PART_ContentPresenter"
-                                    Content="{TemplateBinding DropDownContent}" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
deleted file mode 100644
index 9f08c400..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class IconButton : Button
-  {
-    #region Constructors
-
-    static IconButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( IconButton ), new FrameworkPropertyMetadata( typeof( IconButton ) ) );
-    }
-
-    public IconButton()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region Icon
-
-    public static readonly DependencyProperty IconProperty = DependencyProperty.Register( "Icon", typeof( Image ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-    public Image Icon
-    {
-      get
-      {
-        return ( Image )this.GetValue( IconButton.IconProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.IconProperty, value );
-      }
-    }
-
-    #endregion //Icon
-
-    #region IconLocation
-
-    public static readonly DependencyProperty IconLocationProperty = DependencyProperty.Register( "IconLocation", typeof( Location ),
-      typeof( IconButton ), new FrameworkPropertyMetadata( Location.Left ) );
-    public Location IconLocation
-    {
-      get
-      {
-        return ( Location )this.GetValue( IconButton.IconLocationProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.IconLocationProperty, value );
-      }
-    }
-
-    #endregion //IconLocation
-
-    #region MouseOverBackground
-
-    public static readonly DependencyProperty MouseOverBackgroundProperty = DependencyProperty.Register( "MouseOverBackground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MouseOverBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MouseOverBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MouseOverBackgroundProperty, value );
-      }
-    }
-
-    #endregion //MouseOverBackground
-
-    #region MouseOverBorderBrush
-
-    public static readonly DependencyProperty MouseOverBorderBrushProperty = DependencyProperty.Register( "MouseOverBorderBrush", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MouseOverBorderBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MouseOverBorderBrushProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MouseOverBorderBrushProperty, value );
-      }
-    }
-
-    #endregion //MouseOverBorderBrush
-
-    #region MouseOverForeground
-
-    public static readonly DependencyProperty MouseOverForegroundProperty = DependencyProperty.Register( "MouseOverForeground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MouseOverForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MouseOverForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MouseOverForegroundProperty, value );
-      }
-    }
-
-    #endregion //MouseOverForeground
-
-    #region MousePressedBackground
-
-    public static readonly DependencyProperty MousePressedBackgroundProperty = DependencyProperty.Register( "MousePressedBackground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MousePressedBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MousePressedBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MousePressedBackgroundProperty, value );
-      }
-    }
-
-    #endregion  //MousePressedBackground
-
-    #region MousePressedBorderBrush
-
-    public static readonly DependencyProperty MousePressedBorderBrushProperty = DependencyProperty.Register( "MousePressedBorderBrush", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MousePressedBorderBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MousePressedBorderBrushProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MousePressedBorderBrushProperty, value );
-      }
-    }
-
-    #endregion  //MousePressedBorderBrush
-
-    #region MousePressedForeground
-
-    public static readonly DependencyProperty MousePressedForegroundProperty = DependencyProperty.Register( "MousePressedForeground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MousePressedForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MousePressedForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MousePressedForegroundProperty, value );
-      }
-    }
-
-    #endregion  //MousePressedForeground
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 6edb1d07..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,166 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-
-  <!-- =============================================================================== -->
-  <!--  IconButton Style                                                               -->
-  <!-- =============================================================================== -->
-  <Style x:Key="FocusVisual">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Margin="2"
-                     SnapsToDevicePixels="true"
-                     Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                     StrokeThickness="1"
-                     StrokeDashArray="1 2" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:IconButton}">
-    <Setter Property="FocusVisualStyle"
-            Value="{StaticResource FocusVisual}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="Foreground"
-            Value="Black" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="MouseOverForeground"
-            Value="Black" />
-    <Setter Property="MousePressedForeground"
-            Value="Black" />
-    <Setter Property="MouseOverBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-    <Setter Property="MousePressedBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-    <Setter Property="MouseOverBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-    <Setter Property="MousePressedBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Padding"
-            Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:IconButton}">
-          <Border x:Name="defaultBorder"
-                  BorderThickness="1"
-                  BorderBrush="Transparent">
-            <Border x:Name="border"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    SnapsToDevicePixels="True">
-              <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    Margin="{TemplateBinding Padding}"
-                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition x:Name="firstColumn"
-                                    Width="Auto" />
-                  <ColumnDefinition x:Name="secondColumn"
-                                    Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <ContentControl x:Name="icon"
-                                Content="{TemplateBinding Icon}"
-                                VerticalAlignment="Center" />
-                <ContentPresenter x:Name="contentPresenter"
-                                  Grid.Column="1"
-                                  Focusable="False"
-                                  RecognizesAccessKey="True"
-                                  VerticalAlignment="Center" />
-              </Grid>
-            </Border>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsDefaulted"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      TargetName="defaultBorder"
-                      Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MouseOverForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MousePressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MousePressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MousePressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter TargetName="border"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
-              <Setter TargetName="border"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IconLocation"
-                     Value="Right">
-              <Setter Property="Width"
-                      Value="*"
-                      TargetName="firstColumn" />
-              <Setter Property="Width"
-                      Value="Auto"
-                      TargetName="secondColumn" />
-              <Setter Property="Grid.Column"
-                      Value="1"
-                      TargetName="icon" />
-              <Setter Property="Grid.Column"
-                      Value="0"
-                      TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
deleted file mode 100644
index 6edb1d07..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
+++ /dev/null
@@ -1,166 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-
-  <!-- =============================================================================== -->
-  <!--  IconButton Style                                                               -->
-  <!-- =============================================================================== -->
-  <Style x:Key="FocusVisual">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Margin="2"
-                     SnapsToDevicePixels="true"
-                     Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                     StrokeThickness="1"
-                     StrokeDashArray="1 2" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:IconButton}">
-    <Setter Property="FocusVisualStyle"
-            Value="{StaticResource FocusVisual}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="Foreground"
-            Value="Black" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="MouseOverForeground"
-            Value="Black" />
-    <Setter Property="MousePressedForeground"
-            Value="Black" />
-    <Setter Property="MouseOverBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-    <Setter Property="MousePressedBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-    <Setter Property="MouseOverBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-    <Setter Property="MousePressedBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Padding"
-            Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:IconButton}">
-          <Border x:Name="defaultBorder"
-                  BorderThickness="1"
-                  BorderBrush="Transparent">
-            <Border x:Name="border"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    SnapsToDevicePixels="True">
-              <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    Margin="{TemplateBinding Padding}"
-                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition x:Name="firstColumn"
-                                    Width="Auto" />
-                  <ColumnDefinition x:Name="secondColumn"
-                                    Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <ContentControl x:Name="icon"
-                                Content="{TemplateBinding Icon}"
-                                VerticalAlignment="Center" />
-                <ContentPresenter x:Name="contentPresenter"
-                                  Grid.Column="1"
-                                  Focusable="False"
-                                  RecognizesAccessKey="True"
-                                  VerticalAlignment="Center" />
-              </Grid>
-            </Border>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsDefaulted"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      TargetName="defaultBorder"
-                      Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MouseOverForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MousePressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MousePressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MousePressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter TargetName="border"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
-              <Setter TargetName="border"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IconLocation"
-                     Value="Right">
-              <Setter Property="Width"
-                      Value="*"
-                      TargetName="firstColumn" />
-              <Setter Property="Width"
-                      Value="Auto"
-                      TargetName="secondColumn" />
-              <Setter Property="Grid.Column"
-                      Value="1"
-                      TargetName="icon" />
-              <Setter Property="Grid.Column"
-                      Value="0"
-                      TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
deleted file mode 100644
index d752ad10..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Mag.Converters
-{
-  public class RadiusConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return ( double )value * 2;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
deleted file mode 100644
index cd1bfa2c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum FrameType
-  {
-    Circle,
-    Rectangle
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
deleted file mode 100644
index 7e1f8d78..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_VisualBrush, Type = typeof( VisualBrush ) )]
-  public class Magnifier : Control
-  {
-    private const double DEFAULT_SIZE = 100d;
-    private const string PART_VisualBrush = "PART_VisualBrush";
-
-    #region Private Members
-
-    private VisualBrush _visualBrush = new VisualBrush();
-
-    #endregion //Private Members
-
-    #region Properties
-
-    #region FrameType
-
-    public static readonly DependencyProperty FrameTypeProperty = DependencyProperty.Register( "FrameType", typeof( FrameType ), typeof( Magnifier ), new UIPropertyMetadata( FrameType.Circle, OnFrameTypeChanged ) );
-    public FrameType FrameType
-    {
-      get
-      {
-        return ( FrameType )GetValue( FrameTypeProperty );
-      }
-      set
-      {
-        SetValue( FrameTypeProperty, value );
-      }
-    }
-
-    private static void OnFrameTypeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Magnifier m = ( Magnifier )d;
-      m.OnFrameTypeChanged( ( FrameType )e.OldValue, ( FrameType )e.NewValue );
-    }
-
-    protected virtual void OnFrameTypeChanged( FrameType oldValue, FrameType newValue )
-    {
-      this.UpdateSizeFromRadius();
-    }
-
-    #endregion //FrameType
-
-    #region IsUsingZoomOnMouseWheel
-
-    public static readonly DependencyProperty IsUsingZoomOnMouseWheelProperty = DependencyProperty.Register( "IsUsingZoomOnMouseWheel", typeof( bool )
-      , typeof( Magnifier ), new UIPropertyMetadata( true ) );
-    public bool IsUsingZoomOnMouseWheel
-    {
-      get
-      {
-        return (bool)GetValue( IsUsingZoomOnMouseWheelProperty );
-      }
-      set
-      {
-        SetValue( IsUsingZoomOnMouseWheelProperty, value );
-      }
-    }
-
-    #endregion //IsUsingZoomOnMouseWheel
-
-    #region IsFrozen
-
-    public bool IsFrozen
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region Radius
-
-    public static readonly DependencyProperty RadiusProperty = DependencyProperty.Register( "Radius", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( ( Magnifier.DEFAULT_SIZE / 2 ), new PropertyChangedCallback( OnRadiusPropertyChanged ) ) );
-    public double Radius
-    {
-      get
-      {
-        return ( double )GetValue( RadiusProperty );
-      }
-      set
-      {
-        SetValue( RadiusProperty, value );
-      }
-    }
-
-    private static void OnRadiusPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Magnifier m = ( Magnifier )d;
-      m.OnRadiusChanged( e );
-    }
-
-    protected virtual void OnRadiusChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.UpdateSizeFromRadius();
-    }
-
-    #endregion
-
-    #region Target
-
-    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register( "Target", typeof( UIElement ), typeof( Magnifier ) );
-    public UIElement Target
-    {
-      get
-      {
-        return ( UIElement )GetValue( TargetProperty );
-      }
-      set
-      {
-        SetValue( TargetProperty, value );
-      }
-    }
-
-    #endregion //Target
-
-    #region ViewBox
-
-    internal Rect ViewBox
-    {
-      get
-      {
-        return _visualBrush.Viewbox;
-      }
-      set
-      {
-        _visualBrush.Viewbox = value;
-      }
-    }
-
-    #endregion
-
-    #region ZoomFactor
-
-    public static readonly DependencyProperty ZoomFactorProperty = DependencyProperty.Register( "ZoomFactor", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( 0.5, OnZoomFactorPropertyChanged), OnValidationCallback );
-    public double ZoomFactor
-    {
-      get
-      {
-        return ( double )GetValue( ZoomFactorProperty );
-      }
-      set
-      {
-        SetValue( ZoomFactorProperty, value );
-      }
-    }
-
-    private static bool OnValidationCallback( object baseValue )
-    {
-      double zoomFactor = ( double )baseValue;
-      return ( zoomFactor >= 0 );
-    }
-
-    private static void OnZoomFactorPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Magnifier m = ( Magnifier )d;
-      m.OnZoomFactorChanged( e );
-    }
-
-    protected virtual void OnZoomFactorChanged( DependencyPropertyChangedEventArgs e )
-    {
-      UpdateViewBox();
-    }
-
-    #endregion //ZoomFactor
-
-    #region ZoomFactorOnMouseWheel
-
-    public static readonly DependencyProperty ZoomFactorOnMouseWheelProperty = DependencyProperty.Register( "ZoomFactorOnMouseWheel", typeof( double )
-      , typeof( Magnifier ), new FrameworkPropertyMetadata( 0.1d, OnZoomFactorOnMouseWheelPropertyChanged ), OnZoomFactorOnMouseWheelValidationCallback );
-    public double ZoomFactorOnMouseWheel
-    {
-      get
-      {
-        return (double)GetValue( ZoomFactorOnMouseWheelProperty );
-      }
-      set
-      {
-        SetValue( ZoomFactorOnMouseWheelProperty, value );
-      }
-    }
-
-    private static bool OnZoomFactorOnMouseWheelValidationCallback( object baseValue )
-    {
-      double zoomFactorOnMouseWheel = (double)baseValue;
-      return (zoomFactorOnMouseWheel >= 0);
-    }
-
-    private static void OnZoomFactorOnMouseWheelPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Magnifier m = (Magnifier)d;
-      m.OnZoomFactorOnMouseWheelChanged( e );
-    }
-
-    protected virtual void OnZoomFactorOnMouseWheelChanged( DependencyPropertyChangedEventArgs e )
-    {
-    }
-
-    #endregion //ZoomFactorOnMouseWheel
-
-    #endregion //Properties
-
-    #region Constructors
-
-    /// <summary>
-    /// Initializes static members of the <see cref="Magnifier"/> class.
-    /// </summary>
-    static Magnifier()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( typeof( Magnifier ) ) );
-      HeightProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( Magnifier.DEFAULT_SIZE ) );
-      WidthProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( Magnifier.DEFAULT_SIZE ) );
-    }
-
-    public Magnifier()
-    {
-      this.SizeChanged += new SizeChangedEventHandler( OnSizeChangedEvent );
-    }
-
-    private void OnSizeChangedEvent( object sender, SizeChangedEventArgs e )
-    {
-      UpdateViewBox();
-    }
-
-    private void UpdateSizeFromRadius()
-    {
-      if( this.FrameType == Toolkit.FrameType.Circle )
-      {
-        double newSize = Radius * 2;
-        if(!DoubleHelper.AreVirtuallyEqual( Width, newSize ))
-        {
-          Width = newSize;
-        }
-
-        if(!DoubleHelper.AreVirtuallyEqual( Height, newSize ))
-        {
-          Height = newSize;
-        }
-      }
-    }
-
-    #endregion
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      VisualBrush newBrush = GetTemplateChild( PART_VisualBrush ) as VisualBrush;
-
-      // Just create a brush as placeholder even if there is no such brush.
-      // This avoids having to "if" each access to the _visualBrush member.
-      // Do not keep the current _visualBrush whatsoever to avoid memory leaks.
-      if( newBrush == null )
-      {
-        newBrush = new VisualBrush();
-      }
-
-      newBrush.Viewbox = _visualBrush.Viewbox;
-      _visualBrush = newBrush;
-    }
-
-    #endregion // Base Class Overrides
-
-    #region Public Methods
-
-    public void Freeze( bool freeze )
-    {
-      this.IsFrozen = freeze;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void UpdateViewBox()
-    {
-      if( !IsInitialized )
-        return;
-
-      ViewBox = new Rect( 
-        ViewBox.Location, 
-        new Size( ActualWidth * ZoomFactor , ActualHeight * ZoomFactor ) );
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
deleted file mode 100644
index b0ef685c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class MagnifierAdorner : Adorner
-  {
-    #region Members
-
-    private Magnifier _magnifier;
-    private Point _currentMousePosition;
-    private double _currentZoomFactor;
-
-    #endregion
-
-    #region Constructors
-
-    public MagnifierAdorner( UIElement element, Magnifier magnifier )
-      : base( element )
-    {
-      _magnifier = magnifier;
-      _currentZoomFactor = _magnifier.ZoomFactor;
-      UpdateViewBox();
-      AddVisualChild( _magnifier );
-
-      Loaded += ( s, e ) => InputManager.Current.PostProcessInput += OnProcessInput;
-      Unloaded += ( s, e ) => InputManager.Current.PostProcessInput -= OnProcessInput;
-    }
-
-
-    #endregion
-
-    #region Private/Internal methods
-
-    private void OnProcessInput( object sender, ProcessInputEventArgs e )
-    {
-      Point pt = Mouse.GetPosition( this );
-
-      if( (_currentMousePosition == pt) && (_magnifier.ZoomFactor == _currentZoomFactor) )
-        return;
-
-      if( _magnifier.IsFrozen )
-        return;
-
-      _currentMousePosition = pt;
-      _currentZoomFactor = _magnifier.ZoomFactor;
-      UpdateViewBox();
-      InvalidateArrange();
-    }
-
-    internal void UpdateViewBox()
-    {
-      var viewBoxLocation = CalculateViewBoxLocation();
-      _magnifier.ViewBox = new Rect( viewBoxLocation, _magnifier.ViewBox.Size );
-    }
-
-    private Point CalculateViewBoxLocation()
-    {
-      double offsetX = 0, offsetY = 0;
-
-      Point adorner = Mouse.GetPosition( this );
-      Point element = Mouse.GetPosition( AdornedElement );
-
-      offsetX = element.X - adorner.X;
-      offsetY = element.Y - adorner.Y;
-
-      //An element will use the offset from its parent (StackPanel, Grid, etc.) to be rendered.
-      //When this element is put in a VisualBrush, the element will draw with that offset applied. 
-      //To fix this: we add that parent offset to Magnifier location.
-      Vector parentOffsetVector = VisualTreeHelper.GetOffset( _magnifier.Target );
-      Point parentOffset = new Point( parentOffsetVector.X, parentOffsetVector.Y );
-
-      double left = _currentMousePosition.X - ( ( _magnifier.ViewBox.Width / 2 ) + offsetX ) + parentOffset.X;
-      double top = _currentMousePosition.Y - ( ( _magnifier.ViewBox.Height / 2 ) + offsetY ) + parentOffset.Y;
-      return new Point( left, top );
-    }
-
-    #endregion
-
-    #region Overrides
-
-    protected override Visual GetVisualChild( int index )
-    {
-      return _magnifier;
-    }
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return 1;
-      }
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      _magnifier.Measure( constraint );
-      return base.MeasureOverride( constraint );
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      double x = _currentMousePosition.X - ( _magnifier.Width / 2 );
-      double y = _currentMousePosition.Y - ( _magnifier.Height / 2 );
-      _magnifier.Arrange( new Rect( x, y, _magnifier.Width, _magnifier.Height ) );
-      return base.ArrangeOverride( finalSize );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
deleted file mode 100644
index 88856103..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class MagnifierManager : DependencyObject
-  {
-    #region Members
-
-    private MagnifierAdorner _adorner;
-    private UIElement _element;
-
-    #endregion //Members
-
-    #region Properties
-
-    public static readonly DependencyProperty CurrentProperty = DependencyProperty.RegisterAttached( "Magnifier", typeof( Magnifier ), typeof( UIElement ), new FrameworkPropertyMetadata( null, OnMagnifierChanged ) );
-    public static void SetMagnifier( UIElement element, Magnifier value )
-    {
-      element.SetValue( CurrentProperty, value );
-    }
-    public static Magnifier GetMagnifier( UIElement element )
-    {
-      return ( Magnifier )element.GetValue( CurrentProperty );
-    }
-
-    private static void OnMagnifierChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      UIElement target = d as UIElement;
-
-      if( target == null )
-        throw new ArgumentException( "Magnifier can only be attached to a UIElement." );
-
-      MagnifierManager manager = new MagnifierManager();
-      manager.AttachToMagnifier( target, e.NewValue as Magnifier );
-    }
-
-    #endregion //Properties
-
-    #region Event Handlers
-
-    private void Element_MouseLeave( object sender, MouseEventArgs e )
-    {
-      var magnifier = MagnifierManager.GetMagnifier( _element ) as Magnifier;
-      if( ( magnifier != null ) && magnifier.IsFrozen )
-        return;
-
-      HideAdorner();
-    }
-
-    private void Element_MouseEnter( object sender, MouseEventArgs e )
-    {
-      ShowAdorner();
-    }
-
-    private void Element_MouseWheel( object sender, MouseWheelEventArgs e )
-    {
-      var magnifier = MagnifierManager.GetMagnifier( _element ) as Magnifier;
-      if( (magnifier != null) && magnifier.IsUsingZoomOnMouseWheel )
-      {
-        if( e.Delta < 0 )
-        {
-          var newValue = magnifier.ZoomFactor + magnifier.ZoomFactorOnMouseWheel;
-#if VS2008
-          magnifier.ZoomFactor = newValue;
-#else
-          magnifier.SetCurrentValue( Magnifier.ZoomFactorProperty, newValue );
-#endif
-        }
-        else if ( e.Delta > 0 )
-        {
-          var newValue = (magnifier.ZoomFactor >= magnifier.ZoomFactorOnMouseWheel) ? magnifier.ZoomFactor - magnifier.ZoomFactorOnMouseWheel : 0d;
-#if VS2008
-          magnifier.ZoomFactor = newValue;
-#else
-          magnifier.SetCurrentValue( Magnifier.ZoomFactorProperty, newValue );
-#endif
-        }
-        _adorner.UpdateViewBox();
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void AttachToMagnifier( UIElement element, Magnifier magnifier )
-    {
-      _element = element;
-      _element.MouseEnter += this.Element_MouseEnter;
-      _element.MouseLeave += this.Element_MouseLeave;
-      _element.MouseWheel += this.Element_MouseWheel;
-
-      magnifier.Target = _element;
-
-      _adorner = new MagnifierAdorner( _element, magnifier );
-    }
-
-    void ShowAdorner()
-    {
-      VerifyAdornerLayer();
-      _adorner.Visibility = Visibility.Visible;
-    }
-
-    bool VerifyAdornerLayer()
-    {
-      if( _adorner.Parent != null )
-        return true;
-
-      AdornerLayer layer = AdornerLayer.GetAdornerLayer( _element );
-      if( layer == null )
-        return false;
-
-      layer.Add( _adorner );
-      return true;
-    }
-
-    void HideAdorner()
-    {
-      if( _adorner.Visibility == Visibility.Visible )
-      {
-        _adorner.Visibility = Visibility.Collapsed;
-      }
-    }
-
-#endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
deleted file mode 100644
index 5bad5932..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Mag.Converters"
-                    xmlns:coreconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-   <!-- =============================================================================== -->
-   <!-- Magnifier                                                                       -->
-   <!-- =============================================================================== -->
-
-   <conv:RadiusConverter x:Key="RadiusConverter" />
-   <coreconv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
-
-   <ControlTemplate x:Key="CircleTemplate" TargetType="{x:Type local:Magnifier}">
-      <Grid>
-         <Ellipse Fill="{TemplateBinding Background}" />
-         <Ellipse Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}" 
-                  StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
-            <Ellipse.Fill>
-               <VisualBrush x:Name="PART_VisualBrush"
-                            ViewboxUnits="Absolute"
-                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Ellipse.Fill>
-         </Ellipse>
-      </Grid>
-   </ControlTemplate>
-
-   <ControlTemplate x:Key="RectangleTemplate" TargetType="{x:Type local:Magnifier}">
-      <Grid Background="{TemplateBinding Background}" >
-         <Rectangle Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}"
-                    StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
-            <Rectangle.Fill>
-               <VisualBrush x:Name="PART_VisualBrush"
-                            ViewboxUnits="Absolute"
-                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Rectangle.Fill>
-         </Rectangle>
-      </Grid>
-   </ControlTemplate>
-
-   <Style TargetType="{x:Type local:Magnifier}">
-      <Setter Property="IsHitTestVisible" Value="False" />
-      <Style.Triggers>
-         <Trigger Property="FrameType" Value="Circle">
-            <Setter Property="Template" Value="{StaticResource CircleTemplate}" />
-         </Trigger>
-         <Trigger Property="FrameType" Value="Rectangle">
-            <Setter Property="Template" Value="{StaticResource RectangleTemplate}" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
deleted file mode 100644
index 7e582501..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class AutoCompletingMaskEventArgs : CancelEventArgs
-  {
-    public AutoCompletingMaskEventArgs( MaskedTextProvider maskedTextProvider, int startPosition, int selectionLength, string input )
-    {
-      m_autoCompleteStartPosition = -1;
-
-      m_maskedTextProvider = maskedTextProvider;
-      m_startPosition = startPosition;
-      m_selectionLength = selectionLength;
-      m_input = input;
-    }
-
-    #region MaskedTextProvider PROPERTY
-
-    private MaskedTextProvider m_maskedTextProvider;  
-
-    public MaskedTextProvider MaskedTextProvider
-    {
-      get { return m_maskedTextProvider; }
-    }
-
-    #endregion MaskedTextProvider PROPERTY
-
-    #region StartPosition PROPERTY
-
-    private int m_startPosition;
-
-    public int StartPosition
-    {
-      get { return m_startPosition; }
-    }
-
-    #endregion StartPosition PROPERTY
-
-    #region SelectionLength PROPERTY
-
-    private int m_selectionLength;
-
-    public int SelectionLength
-    {
-      get { return m_selectionLength; }
-    }
-
-    #endregion SelectionLength PROPERTY
-
-    #region Input PROPERTY
-
-    private string m_input;
-
-    public string Input
-    {
-      get { return m_input; }
-    }
-
-    #endregion Input PROPERTY
-
-
-    #region AutoCompleteStartPosition PROPERTY
-
-    private int m_autoCompleteStartPosition;
-
-    public int AutoCompleteStartPosition
-    {
-      get { return m_autoCompleteStartPosition; }
-      set { m_autoCompleteStartPosition = value; }
-    }
-
-    #endregion AutoCompleteStartPosition PROPERTY
-
-    #region AutoCompleteText PROPERTY
-
-    private string m_autoCompleteText;
-
-    public string AutoCompleteText
-    {
-      get { return m_autoCompleteText; }
-      set { m_autoCompleteText = value; }
-    }
-
-    #endregion AutoCompleteText PROPERTY
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
deleted file mode 100644
index a8cbe8fd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum InsertKeyMode
-  {
-    Default = 0,
-    Insert = 1,
-    Overwrite = 2
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
deleted file mode 100644
index 6114a0cd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum MaskFormat
-  {
-    ExcludePromptAndLiterals,
-    IncludeLiterals,
-    IncludePrompt,
-    IncludePromptAndLiterals
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
deleted file mode 100644
index f9c7932a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ /dev/null
@@ -1,1955 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows;
-using System.Windows.Data;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Windows.Input;
-using System.Diagnostics;
-using System.Windows.Documents;
-using System.Globalization;
-using System.Windows.Controls.Primitives;
-using System.Reflection;
-
-using System.Collections;
-using System.Security;
-using System.Security.Permissions;
-using System.Windows.Automation;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class MaskedTextBox : ValueRangeTextBox
-  {
-    #region STATIC MEMBERS
-
-    private static readonly char[] MaskChars = { '0', '9', '#', 'L', '?', '&', 'C', 'A', 'a', '.', ',', ':', '/', '$', '<', '>', '|', '\\' };
-
-    private static char DefaultPasswordChar = '\0';
-
-    private static string NullMaskString = "<>";
-
-    private static string GetRawText( MaskedTextProvider provider )
-    {
-      return provider.ToString( true, false, false, 0, provider.Length );
-    }
-
-    public static string GetFormatSpecifierFromMask( string mask, IFormatProvider formatProvider )
-    {
-      List<int> notUsed;
-
-      return MaskedTextBox.GetFormatSpecifierFromMask(
-        mask,
-        MaskedTextBox.MaskChars,
-        formatProvider,
-        true,
-        out notUsed );
-    }
-
-    private static string GetFormatSpecifierFromMask(
-      string mask,
-      char[] maskChars,
-      IFormatProvider formatProvider,
-      bool includeNonSeparatorLiteralsInValue,
-      out List<int> unhandledLiteralsPositions )
-    {
-      unhandledLiteralsPositions = new List<int>();
-
-      NumberFormatInfo numberFormatInfo = NumberFormatInfo.GetInstance( formatProvider );
-
-      StringBuilder formatSpecifierBuilder = new StringBuilder( 32 );
-
-      // Space will be considered as a separator literals and will be included 
-      // no matter the value of IncludeNonSeparatorLiteralsInValue.
-      bool lastCharIsLiteralIdentifier = false;
-      int i = 0;
-      int j = 0;
-
-      while( i < mask.Length )
-      {
-        char currentChar = mask[ i ];
-
-        if( ( currentChar == '\\' ) && ( !lastCharIsLiteralIdentifier ) )
-        {
-          lastCharIsLiteralIdentifier = true;
-        }
-        else
-        {
-          if( ( lastCharIsLiteralIdentifier ) || ( Array.IndexOf( maskChars, currentChar ) < 0 ) )
-          {
-            lastCharIsLiteralIdentifier = false;
-
-            // The currentChar was preceeded by a liteal identifier or is not part of the MaskedTextProvider mask chars.
-            formatSpecifierBuilder.Append( '\\' );
-            formatSpecifierBuilder.Append( currentChar );
-
-            if( ( !includeNonSeparatorLiteralsInValue ) && ( currentChar != ' ' ) )
-              unhandledLiteralsPositions.Add( j );
-
-            j++;
-          }
-          else
-          {
-            // The currentChar is part of the MaskedTextProvider mask chars.  
-            if( ( currentChar == '0' ) || ( currentChar == '9' ) || ( currentChar == '#' ) )
-            {
-              formatSpecifierBuilder.Append( '0' );
-              j++;
-            }
-            else if( currentChar == '.' )
-            {
-              formatSpecifierBuilder.Append( '.' );
-              j += numberFormatInfo.NumberDecimalSeparator.Length;
-            }
-            else if( currentChar == ',' )
-            {
-              formatSpecifierBuilder.Append( ',' );
-              j += numberFormatInfo.NumberGroupSeparator.Length;
-            }
-            else if( currentChar == '$' )
-            {
-              string currencySymbol = numberFormatInfo.CurrencySymbol;
-
-              formatSpecifierBuilder.Append( '"' );
-              formatSpecifierBuilder.Append( currencySymbol );
-              formatSpecifierBuilder.Append( '"' );
-
-              for( int k = 0; k < currencySymbol.Length; k++ )
-              {
-                if( !includeNonSeparatorLiteralsInValue )
-                  unhandledLiteralsPositions.Add( j );
-
-                j++;
-              }
-            }
-            else
-            {
-              formatSpecifierBuilder.Append( currentChar );
-
-              if( ( !includeNonSeparatorLiteralsInValue ) && ( currentChar != ' ' ) )
-                unhandledLiteralsPositions.Add( j );
-
-              j++;
-            }
-          }
-        }
-
-        i++;
-      }
-
-      return formatSpecifierBuilder.ToString();
-    }
-
-    #endregion STATIC MEMBERS
-
-    #region CONSTRUCTORS
-
-    static MaskedTextBox()
-    {
-      MaskedTextBox.TextProperty.OverrideMetadata( typeof( MaskedTextBox ),
-        new FrameworkPropertyMetadata(
-        null,
-        new CoerceValueCallback( MaskedTextBox.TextCoerceValueCallback ) ) );
-    }
-
-    public MaskedTextBox()
-    {
-      CommandManager.AddPreviewCanExecuteHandler( this, new CanExecuteRoutedEventHandler( this.OnPreviewCanExecuteCommands ) );
-      CommandManager.AddPreviewExecutedHandler( this, new ExecutedRoutedEventHandler( this.OnPreviewExecutedCommands ) );
-
-      this.CommandBindings.Add( new CommandBinding( ApplicationCommands.Paste, null, new CanExecuteRoutedEventHandler( this.CanExecutePaste ) ) );
-      this.CommandBindings.Add( new CommandBinding( ApplicationCommands.Cut, null, new CanExecuteRoutedEventHandler( this.CanExecuteCut ) ) );
-      this.CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, null, new CanExecuteRoutedEventHandler( this.CanExecuteCopy ) ) );
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.ToggleInsert, new ExecutedRoutedEventHandler( this.ToggleInsertExecutedCallback ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.Delete, null, new CanExecuteRoutedEventHandler( this.CanExecuteDelete ) ) );
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.DeletePreviousWord, null, new CanExecuteRoutedEventHandler( this.CanExecuteDeletePreviousWord ) ) );
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.DeleteNextWord, null, new CanExecuteRoutedEventHandler( this.CanExecuteDeleteNextWord ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.Backspace, null, new CanExecuteRoutedEventHandler( this.CanExecuteBackspace ) ) );
-
-      System.Windows.DragDrop.AddPreviewQueryContinueDragHandler( this, new QueryContinueDragEventHandler( this.PreviewQueryContinueDragCallback ) );
-      this.AllowDrop = false;
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength" )]
-    private void InitializeMaskedTextProvider()
-    {
-      string preInitializedText = this.Text;
-
-      string mask = this.Mask;
-
-      if( mask == string.Empty )
-      {
-        m_maskedTextProvider = this.CreateMaskedTextProvider( MaskedTextBox.NullMaskString );
-        m_maskIsNull = true;
-      }
-      else
-      {
-        m_maskedTextProvider = this.CreateMaskedTextProvider( mask );
-        m_maskIsNull = false;
-      }
-
-      if( ( !m_maskIsNull ) && ( preInitializedText != string.Empty ) )
-      {
-        bool success = m_maskedTextProvider.Add( preInitializedText );
-
-        if( ( !success ) && ( !DesignerProperties.GetIsInDesignMode( this ) ) )
-          throw new InvalidOperationException( "An attempt was made to apply a new mask that cannot be applied to the current text." );
-      }
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region ISupportInitialize
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      this.InitializeMaskedTextProvider();
-
-      this.SetIsMaskCompleted( m_maskedTextProvider.MaskCompleted );
-      this.SetIsMaskFull( m_maskedTextProvider.MaskFull );
-
-      base.OnInitialized( e );
-    }
-
-    #endregion ISupportInitialize
-
-    #region AllowPromptAsInput Property
-
-    public static readonly DependencyProperty AllowPromptAsInputProperty =
-        DependencyProperty.Register( "AllowPromptAsInput", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.AllowPromptAsInputPropertyChangedCallback ) ) );
-
-    public bool AllowPromptAsInput
-    {
-      get
-      {
-        return ( bool )GetValue( AllowPromptAsInputProperty );
-      }
-      set
-      {
-        SetValue( AllowPromptAsInputProperty, value );
-      }
-    }
-
-    private static void AllowPromptAsInputPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider = maskedTextBox.CreateMaskedTextProvider( maskedTextBox.Mask );
-    }
-
-    #endregion AllowPromptAsInput Property
-
-    #region ClipboardMaskFormat Property
-
-    public MaskFormat ClipboardMaskFormat
-    {
-      get
-      {
-        return ( MaskFormat )GetValue( ClipboardMaskFormatProperty );
-      }
-      set
-      {
-        SetValue( ClipboardMaskFormatProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ClipboardMaskFormatProperty =
-        DependencyProperty.Register( "ClipboardMaskFormat", typeof( MaskFormat ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata( MaskFormat.IncludeLiterals ) );
-
-    #endregion ClipboardMaskFormat Property
-
-    #region HidePromptOnLeave Property
-
-    public bool HidePromptOnLeave
-    {
-      get
-      {
-        return ( bool )GetValue( HidePromptOnLeaveProperty );
-      }
-      set
-      {
-        SetValue( HidePromptOnLeaveProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HidePromptOnLeaveProperty =
-        DependencyProperty.Register( "HidePromptOnLeave", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( false ) );
-
-    #endregion HidePromptOnLeave Property
-
-    #region IncludeLiteralsInValue Property
-
-    public bool IncludeLiteralsInValue
-    {
-      get
-      {
-        return ( bool )GetValue( IncludeLiteralsInValueProperty );
-      }
-      set
-      {
-        SetValue( IncludeLiteralsInValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty IncludeLiteralsInValueProperty =
-        DependencyProperty.Register( "IncludeLiteralsInValue", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.InlcudeLiteralsInValuePropertyChangedCallback ) ) );
-
-    private static void InlcudeLiteralsInValuePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      maskedTextBox.RefreshConversionHelpers();
-      maskedTextBox.RefreshValue();
-    }
-
-    #endregion IncludeLiteralsInValue Property
-
-    #region IncludePromptInValue Property
-
-    public bool IncludePromptInValue
-    {
-      get
-      {
-        return ( bool )GetValue( IncludePromptInValueProperty );
-      }
-      set
-      {
-        SetValue( IncludePromptInValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty IncludePromptInValueProperty =
-        DependencyProperty.Register( "IncludePromptInValue", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      false,
-      new PropertyChangedCallback( MaskedTextBox.IncludePromptInValuePropertyChangedCallback ) ) );
-
-    private static void IncludePromptInValuePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      maskedTextBox.RefreshValue();
-    }
-
-    #endregion IncludePromptInValue Property
-
-    #region InsertKeyMode Property
-
-    public InsertKeyMode InsertKeyMode
-    {
-      get
-      {
-        return ( InsertKeyMode )GetValue( InsertKeyModeProperty );
-      }
-      set
-      {
-        SetValue( InsertKeyModeProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty InsertKeyModeProperty =
-        DependencyProperty.Register( "InsertKeyMode", typeof( InsertKeyMode ), typeof( MaskedTextBox ), new UIPropertyMetadata( InsertKeyMode.Default ) );
-
-    #endregion InsertKeyMode Property
-
-    #region IsMaskCompleted Read-Only Property
-
-    private static readonly DependencyPropertyKey IsMaskCompletedPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsMaskCompleted", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsMaskCompletedProperty = MaskedTextBox.IsMaskCompletedPropertyKey.DependencyProperty;
-
-
-    public bool IsMaskCompleted
-    {
-      get
-      {
-        return ( bool )this.GetValue( MaskedTextBox.IsMaskCompletedProperty );
-      }
-    }
-
-    private void SetIsMaskCompleted( bool value )
-    {
-      this.SetValue( MaskedTextBox.IsMaskCompletedPropertyKey, value );
-    }
-
-    #endregion IsMaskCompleted Read-Only Property
-
-    #region IsMaskFull Read-Only Property
-
-    private static readonly DependencyPropertyKey IsMaskFullPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsMaskFull", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsMaskFullProperty = MaskedTextBox.IsMaskFullPropertyKey.DependencyProperty;
-
-    public bool IsMaskFull
-    {
-      get
-      {
-        return ( bool )this.GetValue( MaskedTextBox.IsMaskFullProperty );
-      }
-    }
-
-    private void SetIsMaskFull( bool value )
-    {
-      this.SetValue( MaskedTextBox.IsMaskFullPropertyKey, value );
-    }
-
-    #endregion IsMaskFull Read-Only Property
-
-    #region Mask Property
-
-    public static readonly DependencyProperty MaskProperty =
-        DependencyProperty.Register( "Mask", typeof( string ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      string.Empty,
-      new PropertyChangedCallback( MaskedTextBox.MaskPropertyChangedCallback ),
-      new CoerceValueCallback( MaskedTextBox.MaskCoerceValueCallback ) ) );
-
-    public string Mask
-    {
-      get
-      {
-        return ( string )this.GetValue( MaskedTextBox.MaskProperty );
-      }
-      set
-      {
-        this.SetValue( MaskedTextBox.MaskProperty, value );
-      }
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    private static object MaskCoerceValueCallback( DependencyObject sender, object value )
-    {
-      if( value == null )
-        value = string.Empty;
-
-      if( value.Equals( string.Empty ) )
-        return value;
-
-      // Validate the text against the would be new Mask.
-
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return value;
-
-      bool valid;
-
-      try
-      {
-        MaskedTextProvider provider = maskedTextBox.CreateMaskedTextProvider( ( string )value );
-
-        string rawText = MaskedTextBox.GetRawText( maskedTextBox.m_maskedTextProvider );
-
-        valid = provider.VerifyString( rawText );
-      }
-      catch( Exception exception )
-      {
-        throw new InvalidOperationException( "An error occured while testing the current text against the new mask.", exception );
-      }
-
-      if( !valid )
-        throw new ArgumentException( "The mask cannot be applied to the current text.", "Mask" );
-
-      return value;
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength" )]
-    private static void MaskPropertyChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      MaskedTextProvider provider = null;
-
-      string mask = ( string )e.NewValue;
-
-      if( mask == string.Empty )
-      {
-        provider = maskedTextBox.CreateMaskedTextProvider( MaskedTextBox.NullMaskString );
-        maskedTextBox.m_maskIsNull = true;
-        maskedTextBox.Text = "";
-      }
-      else
-      {
-        provider = maskedTextBox.CreateMaskedTextProvider( mask );
-        maskedTextBox.m_maskIsNull = false;
-      }
-
-      maskedTextBox.m_maskedTextProvider = provider;
-
-      maskedTextBox.RefreshConversionHelpers();
-
-      if( maskedTextBox.ValueDataType != null )
-      {
-        string textFromValue = maskedTextBox.GetTextFromValue( maskedTextBox.Value );
-        maskedTextBox.m_maskedTextProvider.Set( textFromValue );
-      }
-
-      maskedTextBox.RefreshCurrentText( true );
-    }
-
-    #endregion Mask Property
-
-    #region MaskedTextProvider Property
-
-    public MaskedTextProvider MaskedTextProvider
-    {
-      get
-      {
-        if( !m_maskIsNull )
-          return m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        return null;
-      }
-    }
-
-    #endregion MaskedTextProvider Property
-
-    #region PromptChar Property
-
-    public static readonly DependencyProperty PromptCharProperty =
-        DependencyProperty.Register( "PromptChar", typeof( char ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      '_',
-      new PropertyChangedCallback( MaskedTextBox.PromptCharPropertyChangedCallback ),
-      new CoerceValueCallback( MaskedTextBox.PromptCharCoerceValueCallback ) ) );
-
-    public char PromptChar
-    {
-      get
-      {
-        return ( char )this.GetValue( MaskedTextBox.PromptCharProperty );
-      }
-      set
-      {
-        this.SetValue( MaskedTextBox.PromptCharProperty, value );
-      }
-    }
-
-    private static object PromptCharCoerceValueCallback( object sender, object value )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return value;
-
-      MaskedTextProvider provider = maskedTextBox.m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-      try
-      {
-        provider.PromptChar = ( char )value;
-      }
-      catch( Exception exception )
-      {
-        throw new ArgumentException( "The prompt character is invalid.", exception );
-      }
-
-      return value;
-    }
-
-    private static void PromptCharPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.PromptChar = ( char )e.NewValue;
-
-      maskedTextBox.RefreshCurrentText( true );
-    }
-
-    #endregion PromptChar Property
-
-    #region RejectInputOnFirstFailure Property
-
-    public bool RejectInputOnFirstFailure
-    {
-      get
-      {
-        return ( bool )GetValue( RejectInputOnFirstFailureProperty );
-      }
-      set
-      {
-        SetValue( RejectInputOnFirstFailureProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty RejectInputOnFirstFailureProperty =
-        DependencyProperty.Register( "RejectInputOnFirstFailure", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( true ) );
-
-    #endregion RejectInputOnFirstFailure Property
-
-    #region ResetOnPrompt Property
-
-    public bool ResetOnPrompt
-    {
-      get
-      {
-        return ( bool )GetValue( ResetOnPromptProperty );
-      }
-      set
-      {
-        SetValue( ResetOnPromptProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ResetOnPromptProperty =
-        DependencyProperty.Register( "ResetOnPrompt", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.ResetOnPromptPropertyChangedCallback ) ) );
-
-    private static void ResetOnPromptPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.ResetOnPrompt = ( bool )e.NewValue;
-    }
-
-    #endregion ResetOnPrompt Property
-
-    #region ResetOnSpace Property
-
-    public bool ResetOnSpace
-    {
-      get
-      {
-        return ( bool )GetValue( ResetOnSpaceProperty );
-      }
-      set
-      {
-        SetValue( ResetOnSpaceProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ResetOnSpaceProperty =
-        DependencyProperty.Register( "ResetOnSpace", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.ResetOnSpacePropertyChangedCallback ) ) );
-
-    private static void ResetOnSpacePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.ResetOnSpace = ( bool )e.NewValue;
-    }
-
-    #endregion ResetOnSpace Property
-
-    #region RestrictToAscii Property
-
-    public bool RestrictToAscii
-    {
-      get
-      {
-        return ( bool )GetValue( RestrictToAsciiProperty );
-      }
-      set
-      {
-        SetValue( RestrictToAsciiProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty RestrictToAsciiProperty =
-        DependencyProperty.Register( "RestrictToAscii", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      false,
-      new PropertyChangedCallback( MaskedTextBox.RestrictToAsciiPropertyChangedCallback ),
-      new CoerceValueCallback( MaskedTextBox.RestrictToAsciiCoerceValueCallback ) ) );
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    private static object RestrictToAsciiCoerceValueCallback( object sender, object value )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return value;
-
-      if( maskedTextBox.m_maskIsNull )
-        return value;
-
-      bool restrictToAscii = ( bool )value;
-
-      if( !restrictToAscii )
-        return value;
-
-      // Validate the text to make sure that it is only made of Ascii characters.
-
-      MaskedTextProvider provider = maskedTextBox.CreateMaskedTextProvider(
-        maskedTextBox.Mask,
-        maskedTextBox.GetCultureInfo(),
-        maskedTextBox.AllowPromptAsInput,
-        maskedTextBox.PromptChar,
-        MaskedTextBox.DefaultPasswordChar,
-        restrictToAscii );
-
-      if( !provider.VerifyString( maskedTextBox.Text ) )
-        throw new ArgumentException( "The current text cannot be restricted to ASCII characters. The RestrictToAscii property is set to true.", "RestrictToAscii" );
-
-      return restrictToAscii;
-    }
-
-    private static void RestrictToAsciiPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider = maskedTextBox.CreateMaskedTextProvider( maskedTextBox.Mask );
-
-      maskedTextBox.RefreshCurrentText( true );
-    }
-
-    #endregion RestrictToAscii Property
-
-    #region SkipLiterals Property
-
-    public bool SkipLiterals
-    {
-      get
-      {
-        return ( bool )GetValue( SkipLiteralsProperty );
-      }
-      set
-      {
-        SetValue( SkipLiteralsProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty SkipLiteralsProperty =
-        DependencyProperty.Register( "SkipLiterals", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.SkipLiteralsPropertyChangedCallback ) ) );
-
-    private static void SkipLiteralsPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.SkipLiterals = ( bool )e.NewValue;
-    }
-
-    #endregion SkipLiterals Property
-
-    #region Text Property
-
-    private static object TextCoerceValueCallback( DependencyObject sender, object value )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( maskedTextBox.IsInIMEComposition )
-      {
-        // In IME Composition.  We must return an uncoerced value or else the IME decorator won't disappear after text input.
-        return value;
-      }
-
-      if( value == null )
-        value = string.Empty;
-
-      if( ( maskedTextBox.IsForcingText ) || ( maskedTextBox.m_maskIsNull ) )
-        return value;
-
-      // Only direct affectation to the Text property or binding of the Text property should
-      // come through here.  All other cases should pre-validate the text and affect it through the ForceText method.
-      string text = maskedTextBox.ValidateText( ( string )value );
-
-      return text;
-    }
-
-    private string ValidateText( string text )
-    {
-      string coercedText = text;
-
-      if( this.RejectInputOnFirstFailure )
-      {
-        MaskedTextProvider provider = m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        int notUsed;
-        MaskedTextResultHint hint;
-
-        //0 – Digit zero to 9[ Required ]
-        //9 – Digit 0 – 9[ Optional ]
-        //A – Alpha Numeric. [Required]
-        //a – Alpha Numeric. [Optional]
-        //L – Letters a-z, A-Z[ Required ]
-        //? – Letters a-z, A-Z[ Optional ]
-        //C – Any non-control character [Optional]
-        //< - When first, all following characters are in lower case.
-        //> - When first, all following characters are in upper case.
-        if( provider.Set( text, out notUsed, out hint ) || provider.Mask.StartsWith( ">" ) || provider.Mask.StartsWith( "<" ) )
-        {
-          coercedText = this.GetFormattedString( provider, text );
-        }
-        else
-        {
-          // Coerce the text to remain the same.
-          coercedText = this.GetFormattedString( m_maskedTextProvider, text );
-
-          // The TextPropertyChangedCallback won't be called.
-          // Therefore, we must sync the maskedTextProvider.
-          m_maskedTextProvider.Set( coercedText );
-        }
-      }
-      else
-      {
-        MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-
-        int caretIndex;
-
-        if( this.CanReplace( provider, text, 0, m_maskedTextProvider.Length, this.RejectInputOnFirstFailure, out caretIndex ) )
-        {
-          coercedText = this.GetFormattedString( provider, text );
-        }
-        else
-        {
-          // Coerce the text to remain the same.
-          coercedText = this.GetFormattedString( m_maskedTextProvider, text );
-
-          // The TextPropertyChangedCallback won't be called.
-          // Therefore, we must sync the maskedTextProvider.
-          m_maskedTextProvider.Set( coercedText );
-        }
-      }
-
-      return coercedText;
-    }
-
-    protected override void OnTextChanged( TextChangedEventArgs e )
-    {
-      if( !m_maskIsNull )
-      {
-        if( ( this.IsInValueChanged ) || ( !this.IsForcingText ) )
-        {
-          string newText = this.Text;
-
-          if( m_maskIsNull )
-          {
-            this.CaretIndex = newText.Length;
-          }
-          else
-          {
-            m_maskedTextProvider.Set( newText );
-
-            if( m_maskedTextProvider.Mask.StartsWith( ">" ) || m_maskedTextProvider.Mask.StartsWith( "<" ) )
-            {
-              this.CaretIndex = newText.Length;
-            }
-            else
-            {
-              int caretIndex = m_maskedTextProvider.FindUnassignedEditPositionFrom( 0, true );
-
-              if( caretIndex == -1 )
-                caretIndex = m_maskedTextProvider.Length;
-
-              this.CaretIndex = caretIndex;
-            }
-          }
-        }
-      }
-
-      // m_maskedTextProvider can be null in the designer. With WPF 3.5 SP1, sometimes, 
-      // TextChanged will be triggered before OnInitialized is called.
-      if( m_maskedTextProvider != null )
-      {
-        this.SetIsMaskCompleted( m_maskedTextProvider.MaskCompleted );
-        this.SetIsMaskFull( m_maskedTextProvider.MaskFull );
-      }
-
-      base.OnTextChanged( e );
-    }
-
-    #endregion Text Property
-
-
-    #region COMMANDS
-
-    private void OnPreviewCanExecuteCommands( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      RoutedUICommand routedUICommand = e.Command as RoutedUICommand;
-
-      if( ( routedUICommand != null )
-        && ( ( routedUICommand.Name == "Space" ) || ( routedUICommand.Name == "ShiftSpace" ) ) )
-      {
-        if( this.IsReadOnly )
-        {
-          e.CanExecute = false;
-        }
-        else
-        {
-          MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-          int caretIndex;
-          e.CanExecute = this.CanReplace( provider, " ", this.SelectionStart, this.SelectionLength, this.RejectInputOnFirstFailure, out caretIndex );
-        }
-
-        e.Handled = true;
-      }
-      else if( ( e.Command == ApplicationCommands.Undo ) || ( e.Command == ApplicationCommands.Redo ) )
-      {
-        e.CanExecute = false;
-        e.Handled = true;
-      }
-    }
-
-    private void OnPreviewExecutedCommands( object sender, ExecutedRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      if( e.Command == EditingCommands.Delete )
-      {
-        e.Handled = true;
-        this.Delete( this.SelectionStart, this.SelectionLength, true );
-      }
-      else if( e.Command == EditingCommands.DeleteNextWord )
-      {
-        e.Handled = true;
-        EditingCommands.SelectRightByWord.Execute( null, this as IInputElement );
-        this.Delete( this.SelectionStart, this.SelectionLength, true );
-      }
-      else if( e.Command == EditingCommands.DeletePreviousWord )
-      {
-        e.Handled = true;
-        EditingCommands.SelectLeftByWord.Execute( null, this as IInputElement );
-        this.Delete( this.SelectionStart, this.SelectionLength, false );
-      }
-      else if( e.Command == EditingCommands.Backspace )
-      {
-        e.Handled = true;
-        this.Delete( this.SelectionStart, this.SelectionLength, false );
-      }
-      else if( e.Command == ApplicationCommands.Cut )
-      {
-        e.Handled = true;
-
-        if( ApplicationCommands.Copy.CanExecute( null, this as IInputElement ) )
-          ApplicationCommands.Copy.Execute( null, this as IInputElement );
-
-        this.Delete( this.SelectionStart, this.SelectionLength, true );
-      }
-      else if( e.Command == ApplicationCommands.Copy )
-      {
-        e.Handled = true;
-        this.ExecuteCopy();
-      }
-      else if( e.Command == ApplicationCommands.Paste )
-      {
-        e.Handled = true;
-
-        string clipboardContent = ( string )Clipboard.GetDataObject().GetData( "System.String" );
-        this.Replace( clipboardContent, this.SelectionStart, this.SelectionLength );
-      }
-      else
-      {
-        RoutedUICommand routedUICommand = e.Command as RoutedUICommand;
-
-        if( ( routedUICommand != null )
-          && ( ( routedUICommand.Name == "Space" ) || ( routedUICommand.Name == "ShiftSpace" ) ) )
-        {
-          e.Handled = true;
-          this.ProcessTextInput( " " );
-        }
-      }
-    }
-
-    private void CanExecuteDelete( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.CanExecute = this.CanDelete( this.SelectionStart, this.SelectionLength, true, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteDeletePreviousWord( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canDeletePreviousWord = ( !this.IsReadOnly ) && ( EditingCommands.SelectLeftByWord.CanExecute( null, this as IInputElement ) );
-
-      if( canDeletePreviousWord )
-      {
-        int cachedSelectionStart = this.SelectionStart;
-        int cachedSelectionLength = this.SelectionLength;
-
-        EditingCommands.SelectLeftByWord.Execute( null, this as IInputElement );
-
-        canDeletePreviousWord = this.CanDelete( this.SelectionStart, this.SelectionLength, false, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-
-        if( !canDeletePreviousWord )
-        {
-          this.SelectionStart = cachedSelectionStart;
-          this.SelectionLength = cachedSelectionLength;
-        }
-      }
-
-      e.CanExecute = canDeletePreviousWord;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteDeleteNextWord( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canDeleteNextWord = ( !this.IsReadOnly ) && ( EditingCommands.SelectRightByWord.CanExecute( null, this as IInputElement ) );
-
-      if( canDeleteNextWord )
-      {
-        int cachedSelectionStart = this.SelectionStart;
-        int cachedSelectionLength = this.SelectionLength;
-
-        EditingCommands.SelectRightByWord.Execute( null, this as IInputElement );
-
-        canDeleteNextWord = this.CanDelete( this.SelectionStart, this.SelectionLength, true, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-
-        if( !canDeleteNextWord )
-        {
-          this.SelectionStart = cachedSelectionStart;
-          this.SelectionLength = cachedSelectionLength;
-        }
-      }
-
-      e.CanExecute = canDeleteNextWord;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteBackspace( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.CanExecute = this.CanDelete( this.SelectionStart, this.SelectionLength, false, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteCut( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canCut = ( !this.IsReadOnly ) && ( this.SelectionLength > 0 );
-
-      if( canCut )
-      {
-        int endPosition = ( this.SelectionLength > 0 ) ? ( ( this.SelectionStart + this.SelectionLength ) - 1 ) : this.SelectionStart;
-
-        MaskedTextProvider provider = m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        canCut = provider.RemoveAt( this.SelectionStart, endPosition );
-      }
-
-      e.CanExecute = canCut;
-      e.Handled = true;
-
-      if( ( !canCut ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecutePaste( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canPaste = false;
-
-      if( !this.IsReadOnly )
-      {
-        string clipboardContent = string.Empty;
-
-        try
-        {
-          clipboardContent = ( string )Clipboard.GetDataObject().GetData( "System.String" );
-
-          if( clipboardContent != null )
-          {
-            MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-            int caretIndex;
-            canPaste = this.CanReplace( provider, clipboardContent, this.SelectionStart, this.SelectionLength, this.RejectInputOnFirstFailure, out caretIndex );
-          }
-        }
-        catch
-        {
-        }
-      }
-
-      e.CanExecute = canPaste;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteCopy( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.CanExecute = !m_maskedTextProvider.IsPassword;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void ExecuteCopy()
-    {
-      string selectedText = this.GetSelectedText();
-      try
-      {
-        new UIPermission( UIPermissionClipboard.AllClipboard ).Demand();
-
-        if( selectedText.Length == 0 )
-        {
-          Clipboard.Clear();
-        }
-        else
-        {
-          Clipboard.SetText( selectedText );
-        }
-      }
-      catch( SecurityException )
-      {
-      }
-    }
-
-    private void ToggleInsertExecutedCallback( object sender, ExecutedRoutedEventArgs e )
-    {
-      m_insertToggled = !m_insertToggled;
-    }
-
-    #endregion COMMANDS
-
-    #region DRAG DROP
-
-    private void PreviewQueryContinueDragCallback( object sender, QueryContinueDragEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.Action = DragAction.Cancel;
-      e.Handled = true;
-    }
-
-    protected override void OnDragEnter( DragEventArgs e )
-    {
-      if( !m_maskIsNull )
-      {
-        e.Effects = DragDropEffects.None;
-        e.Handled = true;
-      }
-
-      base.OnDragEnter( e );
-    }
-
-    protected override void OnDragOver( DragEventArgs e )
-    {
-      if( !m_maskIsNull )
-      {
-        e.Effects = DragDropEffects.None;
-        e.Handled = true;
-      }
-
-      base.OnDragOver( e );
-    }
-
-    #endregion DRAG DROP
-
-
-    #region VALUE FROM TEXT
-
-    protected override bool QueryValueFromTextCore( string text, out object value )
-    {
-      Type valueDataType = this.ValueDataType;
-
-      if( valueDataType != null )
-      {
-        if( ( m_unhandledLiteralsPositions != null )
-          && ( m_unhandledLiteralsPositions.Count > 0 ) )
-        {
-          text = m_maskedTextProvider.ToString( false, false, true, 0, m_maskedTextProvider.Length );
-
-          for( int i = m_unhandledLiteralsPositions.Count - 1; i >= 0; i-- )
-          {
-            text = text.Remove( m_unhandledLiteralsPositions[ i ], 1 );
-          }
-        }
-      }
-
-      return base.QueryValueFromTextCore( text, out value );
-    }
-
-    #endregion VALUE FROM TEXT
-
-    #region TEXT FROM VALUE
-
-    protected override string QueryTextFromValueCore( object value )
-    {
-      if( ( m_valueToStringMethodInfo != null ) && ( value != null ) )
-      {
-        try
-        {
-          string text = ( string )m_valueToStringMethodInfo.Invoke( value, new object[] { m_formatSpecifier, this.GetActiveFormatProvider() } );
-          return text;
-        }
-        catch
-        {
-        }
-      }
-
-      return base.QueryTextFromValueCore( value );
-    }
-
-    #endregion TEXT FROM VALUE
-
-
-    #region PROTECTED METHODS
-
-    protected virtual char[] GetMaskCharacters()
-    {
-      return MaskedTextBox.MaskChars;
-    }
-
-    private MaskedTextProvider CreateMaskedTextProvider( string mask )
-    {
-      return this.CreateMaskedTextProvider(
-        mask,
-        this.GetCultureInfo(),
-        this.AllowPromptAsInput,
-        this.PromptChar,
-        MaskedTextBox.DefaultPasswordChar,
-        this.RestrictToAscii );
-    }
-
-    protected virtual MaskedTextProvider CreateMaskedTextProvider(
-      string mask,
-      CultureInfo cultureInfo,
-      bool allowPromptAsInput,
-      char promptChar,
-      char passwordChar,
-      bool restrictToAscii )
-    {
-      MaskedTextProvider provider = new MaskedTextProvider(
-        mask,
-        cultureInfo,
-        allowPromptAsInput,
-        promptChar,
-        passwordChar,
-        restrictToAscii );
-
-      provider.ResetOnPrompt = this.ResetOnPrompt;
-      provider.ResetOnSpace = this.ResetOnSpace;
-      provider.SkipLiterals = this.SkipLiterals;
-
-      provider.IncludeLiterals = true;
-      provider.IncludePrompt = true;
-
-      provider.IsPassword = false;
-
-      return provider;
-    }
-
-    internal override void OnIMECompositionEnded( CachedTextInfo cachedTextInfo )
-    {
-      // End of IME Composition.  Restore the critical infos.
-      this.ForceText( cachedTextInfo.Text, false );
-      this.CaretIndex = cachedTextInfo.CaretIndex;
-      this.SelectionStart = cachedTextInfo.SelectionStart;
-      this.SelectionLength = cachedTextInfo.SelectionLength;
-    }
-
-    protected override void OnTextInput( System.Windows.Input.TextCompositionEventArgs e )
-    {
-      if( this.IsInIMEComposition )
-        this.EndIMEComposition();
-
-      if( ( m_maskIsNull ) || ( m_maskedTextProvider == null ) || ( this.IsReadOnly ) )
-      {
-        base.OnTextInput( e );
-        return;
-      }
-
-      e.Handled = true;
-
-      if( this.CharacterCasing == CharacterCasing.Upper )
-      {
-        this.ProcessTextInput( e.Text.ToUpper() );
-      }
-      else if( this.CharacterCasing == CharacterCasing.Lower )
-      {
-        this.ProcessTextInput( e.Text.ToLower() );
-      }
-      else
-      {
-        this.ProcessTextInput( e.Text );
-      }
-
-      base.OnTextInput( e );
-    }
-
-    private void ProcessTextInput( string text )
-    {
-      if( text.Length == 1 )
-      {
-        string textOutput = this.MaskedTextOutput;
-
-        int caretIndex;
-        if( this.PlaceChar( text[ 0 ], this.SelectionStart, this.SelectionLength, this.IsOverwriteMode, out caretIndex ) )
-        {
-          if( this.MaskedTextOutput != textOutput )
-            this.RefreshCurrentText( false );
-
-          this.SelectionStart = caretIndex + 1;
-        }
-        else
-        {
-          if( this.BeepOnError )
-            System.Media.SystemSounds.Beep.Play();
-        }
-
-        if( this.SelectionLength > 0 )
-          this.SelectionLength = 0;
-      }
-      else
-      {
-        this.Replace( text, this.SelectionStart, this.SelectionLength );
-      }
-    }
-
-    protected override void ValidateValue( object value )
-    {
-      base.ValidateValue( value );
-
-      // Validate if it fits in the mask
-      if( !m_maskIsNull )
-      {
-        string representation = this.GetTextFromValue( value );
-
-        MaskedTextProvider provider = m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        if( !provider.VerifyString( representation ) )
-          throw new ArgumentException( "The value representation '" + representation + "' does not match the mask.", "value" );
-      }
-    }
-
-    #endregion PROTECTED METHODS
-
-
-    #region INTERNAL PROPERTIES
-
-    internal bool IsForcingMask
-    {
-      get
-      {
-        return m_forcingMask;
-      }
-    }
-
-    internal string FormatSpecifier
-    {
-      get
-      {
-        return m_formatSpecifier;
-      }
-      set
-      {
-        m_formatSpecifier = value;
-      }
-    }
-
-    internal override bool IsTextReadyToBeParsed
-    {
-      get
-      {
-        return this.IsMaskCompleted;
-      }
-    }
-
-    internal override bool GetIsEditTextEmpty()
-    {
-      if( !m_maskIsNull )
-        return ( this.MaskedTextProvider.AssignedEditPositionCount == 0 );
-      return true;
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region INTERNAL METHODS
-
-    internal override string GetCurrentText()
-    {
-      if( m_maskIsNull )
-        return base.GetCurrentText();
-
-      string displayText = this.GetFormattedString( m_maskedTextProvider, this.Text );
-
-      return displayText;
-    }
-
-    internal override string GetParsableText()
-    {
-      if( m_maskIsNull )
-        return base.GetParsableText();
-
-      bool includePrompt = false;
-      bool includeLiterals = true;
-
-      if( this.ValueDataType == typeof( string ) )
-      {
-        includePrompt = this.IncludePromptInValue;
-        includeLiterals = this.IncludeLiteralsInValue;
-      }
-
-      return m_maskedTextProvider
-        .ToString( false, includePrompt, includeLiterals, 0, m_maskedTextProvider.Length );
-    }
-
-    internal override void OnFormatProviderChanged()
-    {
-      MaskedTextProvider provider = new MaskedTextProvider( this.Mask );
-
-      m_maskedTextProvider = provider;
-
-      this.RefreshConversionHelpers();
-      this.RefreshCurrentText( true );
-
-      base.OnFormatProviderChanged();
-    }
-
-    internal override void RefreshConversionHelpers()
-    {
-      Type type = this.ValueDataType;
-
-      if( ( type == null ) || ( !this.IsNumericValueDataType ) )
-      {
-        m_formatSpecifier = null;
-        m_valueToStringMethodInfo = null;
-        m_unhandledLiteralsPositions = null;
-        return;
-      }
-
-      m_valueToStringMethodInfo = type.GetMethod( "ToString", new Type[] { typeof( string ), typeof( IFormatProvider ) } );
-
-      string mask = m_maskedTextProvider.Mask;
-      IFormatProvider activeFormatProvider = this.GetActiveFormatProvider();
-
-      char[] maskChars = this.GetMaskCharacters();
-
-      List<int> unhandledLiteralsPositions;
-
-      m_formatSpecifier = MaskedTextBox.GetFormatSpecifierFromMask(
-        mask,
-        maskChars,
-        activeFormatProvider,
-        this.IncludeLiteralsInValue,
-        out unhandledLiteralsPositions );
-
-      NumberFormatInfo numberFormatInfo = activeFormatProvider.GetFormat( typeof( NumberFormatInfo ) ) as NumberFormatInfo;
-
-      if( numberFormatInfo != null )
-      {
-        string negativeSign = numberFormatInfo.NegativeSign;
-
-        if( m_formatSpecifier.Contains( negativeSign ) )
-        {
-          // We must make sure that the value data type is numeric since we are about to 
-          // set the format specifier to its Positive,Negative,Zero format pattern.
-          // If we do not do this, the negative symbol would double itself when IncludeLiteralsInValue
-          // is set to True and a negative symbol is added to the mask as a literal.
-          Debug.Assert( this.IsNumericValueDataType );
-
-          m_formatSpecifier = m_formatSpecifier + ";" + m_formatSpecifier + ";" + m_formatSpecifier;
-        }
-        else
-        {
-
-        }
-      }
-
-      m_unhandledLiteralsPositions = unhandledLiteralsPositions;
-    }
-
-    internal void SetValueToStringMethodInfo( MethodInfo valueToStringMethodInfo )
-    {
-      m_valueToStringMethodInfo = valueToStringMethodInfo;
-    }
-
-    internal void ForceMask( string mask )
-    {
-      m_forcingMask = true;
-
-      try
-      {
-        this.Mask = mask;
-      }
-      finally
-      {
-        m_forcingMask = false;
-      }
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE PROPERTIES
-
-    private bool IsOverwriteMode
-    {
-      get
-      {
-        if( !m_maskIsNull )
-        {
-          switch( this.InsertKeyMode )
-          {
-            case InsertKeyMode.Default:
-              {
-                return m_insertToggled;
-              }
-
-            case InsertKeyMode.Insert:
-              {
-                return false;
-              }
-
-            case InsertKeyMode.Overwrite:
-              {
-                return true;
-              }
-          }
-        }
-
-        return false;
-      }
-    }
-
-    #endregion PRIVATE PROPERTIES
-
-    #region PRIVATE METHODS
-
-    private bool PlaceChar( char ch, int startPosition, int length, bool overwrite, out int caretIndex )
-    {
-      return this.PlaceChar( m_maskedTextProvider, ch, startPosition, length, overwrite, out caretIndex );
-    }
-
-
-    private bool PlaceChar( MaskedTextProvider provider, char ch, int startPosition, int length, bool overwrite, out int caretPosition )
-    {
-      if( this.ShouldQueryAutoCompleteMask( provider.Clone() as MaskedTextProvider, ch, startPosition ) )
-      {
-        AutoCompletingMaskEventArgs e = new AutoCompletingMaskEventArgs(
-          m_maskedTextProvider.Clone() as MaskedTextProvider,
-          startPosition,
-          length,
-          ch.ToString() );
-
-        this.OnAutoCompletingMask( e );
-
-        if( ( !e.Cancel ) && ( e.AutoCompleteStartPosition > -1 ) )
-        {
-          caretPosition = startPosition;
-
-          // AutoComplete the block.
-          for( int i = 0; i < e.AutoCompleteText.Length; i++ )
-          {
-            if( !this.PlaceCharCore( provider, e.AutoCompleteText[ i ], e.AutoCompleteStartPosition + i, 0, true, out caretPosition ) )
-              return false;
-          }
-
-          caretPosition = e.AutoCompleteStartPosition + e.AutoCompleteText.Length;
-          return true;
-        }
-      }
-
-      return this.PlaceCharCore( provider, ch, startPosition, length, overwrite, out caretPosition );
-    }
-
-    private bool ShouldQueryAutoCompleteMask( MaskedTextProvider provider, char ch, int startPosition )
-    {
-      if( provider.IsEditPosition( startPosition ) )
-      {
-        int nextSeparatorIndex = provider.FindNonEditPositionFrom( startPosition, true );
-
-        if( nextSeparatorIndex != -1 )
-        {
-          if( provider[ nextSeparatorIndex ].Equals( ch ) )
-          {
-            int previousSeparatorIndex = provider.FindNonEditPositionFrom( startPosition, false );
-
-            if( provider.FindUnassignedEditPositionInRange( previousSeparatorIndex, nextSeparatorIndex, true ) != -1 )
-            {
-              return true;
-            }
-          }
-        }
-      }
-
-      return false;
-    }
-
-    protected virtual void OnAutoCompletingMask( AutoCompletingMaskEventArgs e )
-    {
-      if( this.AutoCompletingMask != null )
-        this.AutoCompletingMask( this, e );
-    }
-
-    public event EventHandler<AutoCompletingMaskEventArgs> AutoCompletingMask;
-
-
-    private bool PlaceCharCore( MaskedTextProvider provider, char ch, int startPosition, int length, bool overwrite, out int caretPosition )
-    {
-      caretPosition = startPosition;
-
-      if( startPosition < m_maskedTextProvider.Length )
-      {
-        MaskedTextResultHint notUsed;
-
-        if( length > 0 )
-        {
-          int endPosition = ( startPosition + length ) - 1;
-          return provider.Replace( ch, startPosition, endPosition, out caretPosition, out notUsed );
-        }
-
-        if( overwrite )
-          return provider.Replace( ch, startPosition, out caretPosition, out notUsed );
-
-        return provider.InsertAt( ch, startPosition, out caretPosition, out notUsed );
-      }
-
-      return false;
-    }
-
-    internal void Replace( string text, int startPosition, int selectionLength )
-    {
-      MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-      int tentativeCaretIndex;
-
-      if( this.CanReplace( provider, text, startPosition, selectionLength, this.RejectInputOnFirstFailure, out tentativeCaretIndex ) )
-      {
-        System.Diagnostics.Debug.WriteLine( "Replace caret index to: " + tentativeCaretIndex.ToString() );
-
-        bool mustRefreshText = this.MaskedTextOutput != provider.ToString();
-        m_maskedTextProvider = provider;
-
-        if( mustRefreshText )
-          this.RefreshCurrentText( false );
-
-        this.CaretIndex = tentativeCaretIndex + 1;
-      }
-      else
-      {
-        if( this.BeepOnError )
-          System.Media.SystemSounds.Beep.Play();
-      }
-    }
-
-    internal virtual bool CanReplace( MaskedTextProvider provider, string text, int startPosition, int selectionLength, bool rejectInputOnFirstFailure, out int tentativeCaretIndex )
-    {
-      int endPosition = ( startPosition + selectionLength ) - 1;
-      tentativeCaretIndex = -1;
-
-
-      bool success = false;
-
-      foreach( char ch in text )
-      {
-        if( !m_maskedTextProvider.VerifyEscapeChar( ch, startPosition ) )
-        {
-          int editPositionFrom = provider.FindEditPositionFrom( startPosition, true );
-
-          if( editPositionFrom == MaskedTextProvider.InvalidIndex )
-            break;
-
-          startPosition = editPositionFrom;
-        }
-
-        int length = ( endPosition >= startPosition ) ? 1 : 0;
-        bool overwrite = length > 0;
-
-        if( this.PlaceChar( provider, ch, startPosition, length, overwrite, out tentativeCaretIndex ) )
-        {
-          // Only one successfully inserted character is enough to declare the replace operation successful.
-          success = true;
-
-          startPosition = tentativeCaretIndex + 1;
-        }
-        else if( rejectInputOnFirstFailure )
-        {
-          return false;
-        }
-      }
-
-      if( ( selectionLength > 0 ) && ( startPosition <= endPosition ) )
-      {
-
-        // Erase the remaining of the assigned edit character.
-        int notUsed;
-        MaskedTextResultHint notUsedHint;
-        if( !provider.RemoveAt( startPosition, endPosition, out notUsed, out notUsedHint ) )
-          success = false;
-      }
-
-      return success;
-    }
-
-    private bool CanDelete( int startPosition, int selectionLength, bool deleteForward, MaskedTextProvider provider )
-    {
-      if( this.IsReadOnly )
-        return false;
-
-
-      if( selectionLength == 0 )
-      {
-        if( !deleteForward )
-        {
-          if( startPosition == 0 )
-            return false;
-
-          startPosition--;
-        }
-        else if( ( startPosition + selectionLength ) == provider.Length )
-        {
-          return false;
-        }
-      }
-
-      MaskedTextResultHint notUsed;
-      int tentativeCaretPosition = startPosition;
-
-      int endPosition = ( selectionLength > 0 ) ? ( ( startPosition + selectionLength ) - 1 ) : startPosition;
-
-      bool success = provider.RemoveAt( startPosition, endPosition, out tentativeCaretPosition, out notUsed );
-
-      return success;
-    }
-
-    private void Delete( int startPosition, int selectionLength, bool deleteForward )
-    {
-      if( this.IsReadOnly )
-        return;
-
-
-      if( selectionLength == 0 )
-      {
-        if( !deleteForward )
-        {
-          if( startPosition == 0 )
-            return;
-
-          startPosition--;
-        }
-        else if( ( startPosition + selectionLength ) == m_maskedTextProvider.Length )
-        {
-          return;
-        }
-      }
-
-      MaskedTextResultHint hint;
-      int tentativeCaretPosition = startPosition;
-
-      int endPosition = ( selectionLength > 0 ) ? ( ( startPosition + selectionLength ) - 1 ) : startPosition;
-
-      string oldTextOutput = this.MaskedTextOutput;
-
-      bool success = m_maskedTextProvider.RemoveAt( startPosition, endPosition, out tentativeCaretPosition, out hint );
-
-      if( !success )
-      {
-        if( this.BeepOnError )
-          System.Media.SystemSounds.Beep.Play();
-
-        return;
-      }
-
-      if( this.MaskedTextOutput != oldTextOutput )
-      {
-        this.RefreshCurrentText( false );
-      }
-      else if( selectionLength > 0 )
-      {
-        tentativeCaretPosition = startPosition;
-      }
-      else if( hint == MaskedTextResultHint.NoEffect )
-      {
-        if( deleteForward )
-        {
-          tentativeCaretPosition = m_maskedTextProvider.FindEditPositionFrom( startPosition, true );
-        }
-        else
-        {
-          if( m_maskedTextProvider.FindAssignedEditPositionFrom( startPosition, true ) == MaskedTextProvider.InvalidIndex )
-          {
-            tentativeCaretPosition = m_maskedTextProvider.FindAssignedEditPositionFrom( startPosition, false );
-          }
-          else
-          {
-            tentativeCaretPosition = m_maskedTextProvider.FindEditPositionFrom( startPosition, false );
-          }
-
-          if( tentativeCaretPosition != MaskedTextProvider.InvalidIndex )
-            tentativeCaretPosition++;
-        }
-
-        if( tentativeCaretPosition == MaskedTextProvider.InvalidIndex )
-          tentativeCaretPosition = startPosition;
-      }
-      else if( !deleteForward )
-      {
-        tentativeCaretPosition = startPosition;
-      }
-
-      this.CaretIndex = tentativeCaretPosition;
-    }
-
-    private string MaskedTextOutput
-    {
-      get
-      {
-        System.Diagnostics.Debug.Assert( m_maskedTextProvider.EditPositionCount > 0 );
-
-        return m_maskedTextProvider.ToString();
-      }
-    }
-
-    private string GetRawText()
-    {
-      if( m_maskIsNull )
-        return this.Text;
-
-      return MaskedTextBox.GetRawText( m_maskedTextProvider );
-    }
-
-    private string GetFormattedString( MaskedTextProvider provider, string text )
-    {
-      if( provider.Mask.StartsWith( ">" ) )
-        return text.ToUpper();
-      if( provider.Mask.StartsWith( "<" ) )
-        return text.ToLower();
-
-      //System.Diagnostics.Debug.Assert( provider.EditPositionCount > 0 );
-
-
-      bool includePrompt = ( this.IsReadOnly ) ? false : ( !this.HidePromptOnLeave || this.IsFocused );
-
-      string displayString = provider.ToString( false, includePrompt, true, 0, m_maskedTextProvider.Length );
-
-      return displayString;
-    }
-
-    private string GetSelectedText()
-    {
-      System.Diagnostics.Debug.Assert( !m_maskIsNull );
-
-      int selectionLength = this.SelectionLength;
-
-      if( selectionLength == 0 )
-        return string.Empty;
-
-      bool includePrompt = ( this.ClipboardMaskFormat & MaskFormat.IncludePrompt ) != MaskFormat.ExcludePromptAndLiterals;
-      bool includeLiterals = ( this.ClipboardMaskFormat & MaskFormat.IncludeLiterals ) != MaskFormat.ExcludePromptAndLiterals;
-
-      return m_maskedTextProvider.ToString( true, includePrompt, includeLiterals, this.SelectionStart, selectionLength );
-    }
-
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
-
-    private MaskedTextProvider m_maskedTextProvider; // = null;
-    private bool m_insertToggled; // = false;
-    private bool m_maskIsNull = true;
-    private bool m_forcingMask; // = false;
-
-    List<int> m_unhandledLiteralsPositions; // = null;
-    private string m_formatSpecifier;
-    private MethodInfo m_valueToStringMethodInfo; // = null;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png
deleted file mode 100644
index 4304d43b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png
deleted file mode 100644
index 35075187..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png
deleted file mode 100644
index dad7dd09..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png
deleted file mode 100644
index ecb7fe86..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
deleted file mode 100644
index 80fdf126..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
+++ /dev/null
@@ -1,1203 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
-using System.Windows.Input;
-using System.Text;
-using System.Security.Permissions;
-using System.Security;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.Diagnostics;
-using System.Windows.Media.Imaging;
-using System.Windows.Threading;
-using System.Windows.Interop;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplateVisualState( Name = VisualStates.OK, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplateVisualState( Name = VisualStates.OKCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplateVisualState( Name = VisualStates.YesNo, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplateVisualState( Name = VisualStates.YesNoCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplatePart( Name = PART_CancelButton, Type = typeof( Button ) )]
-  [TemplatePart( Name = PART_NoButton, Type = typeof( Button ) )]
-  [TemplatePart( Name = PART_OkButton, Type = typeof( Button ) )]
-  [TemplatePart( Name = PART_YesButton, Type = typeof( Button ) )]
-  [TemplatePart( Name = PART_WindowControl, Type = typeof( WindowControl ) )]
-  public class MessageBox : WindowControl
-  {
-    private const string PART_CancelButton = "PART_CancelButton";
-    private const string PART_NoButton = "PART_NoButton";
-    private const string PART_OkButton = "PART_OkButton";
-    private const string PART_YesButton = "PART_YesButton";
-    private const string PART_CloseButton = "PART_CloseButton";
-    private const string PART_WindowControl = "PART_WindowControl";
-
-    #region Private Members
-
-    /// <summary>
-    /// Tracks the MessageBoxButon value passed into the InitializeContainer method
-    /// </summary>
-    private MessageBoxButton _button = MessageBoxButton.OK;
-
-    /// <summary>
-    /// Tracks the MessageBoxResult to set as the default and focused button
-    /// </summary>
-    private MessageBoxResult _defaultResult = MessageBoxResult.None;
-
-    /// <summary>
-    /// Will contain the result when the messagebox is shown inside a WindowContainer
-    /// </summary>
-    private MessageBoxResult _dialogResult = MessageBoxResult.None;
-
-    /// <summary>
-    /// Tracks the owner of the MessageBox
-    /// </summary>
-    private Window _owner;
-    private IntPtr _ownerHandle;
-
-    private WindowControl _windowControl;
-
-    #endregion //Private Members
-
-    #region Constructors
-
-    static MessageBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( MessageBox ), new FrameworkPropertyMetadata( typeof( MessageBox ) ) );
-    }
-
-    public MessageBox()
-    {
-      this.Visibility = Visibility.Collapsed;
-      this.InitHandlers();
-      this.IsVisibleChanged += this.MessageBox_IsVisibleChanged;
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region Protected Properties
-
-    protected Window Container
-    {
-      get { return ( this.Parent as Window ); }
-    }
-
-    #endregion //Protected Properties
-
-    #region Dependency Properties
-
-    #region ButtonRegionBackground
-
-    public static readonly DependencyProperty ButtonRegionBackgroundProperty = DependencyProperty.Register( "ButtonRegionBackground", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Brush ButtonRegionBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( ButtonRegionBackgroundProperty );
-      }
-      set
-      {
-        SetValue( ButtonRegionBackgroundProperty, value );
-      }
-    }
-
-    #endregion //ButtonRegionBackground
-
-    #region CancelButtonContent
-
-    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Cancel" ) );
-    public object CancelButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( CancelButtonContentProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonContentProperty, value );
-      }
-    }
-
-    #endregion //CancelButtonContent
-
-    #region CancelButtonStyle
-
-    public static readonly DependencyProperty CancelButtonStyleProperty = DependencyProperty.Register( "CancelButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style CancelButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( CancelButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonStyleProperty, value );
-      }
-    }
-
-    #endregion //CancelButtonStyle
-
-    #region ImageSource
-
-    public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register( "ImageSource", typeof( ImageSource ), typeof( MessageBox ), new UIPropertyMetadata( default( ImageSource ) ) );
-    public ImageSource ImageSource
-    {
-      get
-      {
-        return ( ImageSource )GetValue( ImageSourceProperty );
-      }
-      set
-      {
-        SetValue( ImageSourceProperty, value );
-      }
-    }
-
-    #endregion //ImageSource
-
-    #region OkButtonContent
-
-    public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register( "OkButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "OK" ) );
-    public object OkButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( OkButtonContentProperty );
-      }
-      set
-      {
-        SetValue( OkButtonContentProperty, value );
-      }
-    }
-
-    #endregion //OkButtonContent
-
-    #region OkButtonStyle
-
-    public static readonly DependencyProperty OkButtonStyleProperty = DependencyProperty.Register( "OkButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style OkButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( OkButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( OkButtonStyleProperty, value );
-      }
-    }
-
-    #endregion //OkButtonStyle
-
-    #region MessageBoxResult
-
-    /// <summary>
-    /// Gets the MessageBox result, which is set when the "Closed" event is raised.
-    /// </summary>
-    public MessageBoxResult MessageBoxResult
-    {
-      get { return _dialogResult; }
-    }
-
-    #endregion //MessageBoxResult
-
-    #region NoButtonContent
-
-    public static readonly DependencyProperty NoButtonContentProperty = DependencyProperty.Register( "NoButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "No" ) );
-    public object NoButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( NoButtonContentProperty );
-      }
-      set
-      {
-        SetValue( NoButtonContentProperty, value );
-      }
-    }
-
-    #endregion //NoButtonContent
-
-    #region NoButtonStyle
-
-    public static readonly DependencyProperty NoButtonStyleProperty = DependencyProperty.Register( "NoButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style NoButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( NoButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( NoButtonStyleProperty, value );
-      }
-    }
-
-    #endregion //NoButtonStyle
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    #endregion //Text
-
-    #region YesButtonContent
-
-    public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register( "YesButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Yes" ) );
-    public object YesButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( YesButtonContentProperty );
-      }
-      set
-      {
-        SetValue( YesButtonContentProperty, value );
-      }
-    }
-
-    #endregion //YesButtonContent
-
-    #region YesButtonStyle
-
-    public static readonly DependencyProperty YesButtonStyleProperty = DependencyProperty.Register( "YesButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style YesButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( YesButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( YesButtonStyleProperty, value );
-      }
-    }
-
-    #endregion //YesButtonStyle
-
-    #endregion //Dependency Properties
-
-    #endregion //Properties
-
-    #region Base Class Overrides
-
-    internal override bool AllowPublicIsActiveChange
-    {
-      get { return false; }
-    }
-
-    /// <summary>
-    /// Overrides the OnApplyTemplate method.
-    /// </summary>
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _windowControl != null )
-      {
-        _windowControl.HeaderDragDelta -= ( o, e ) => this.OnHeaderDragDelta( e );
-        _windowControl.HeaderIconDoubleClicked -= ( o, e ) => this.OnHeaderIconDoubleClicked( e );
-        _windowControl.CloseButtonClicked -= ( o, e ) => this.OnCloseButtonClicked( e );
-      }
-      _windowControl = this.GetTemplateChild( PART_WindowControl ) as WindowControl;
-      if( _windowControl != null )
-      {
-        _windowControl.HeaderDragDelta += ( o, e ) => this.OnHeaderDragDelta( e );
-        _windowControl.HeaderIconDoubleClicked += ( o, e ) => this.OnHeaderIconDoubleClicked( e );
-        _windowControl.CloseButtonClicked += ( o, e ) => this.OnCloseButtonClicked( e );
-      }
-      this.UpdateBlockMouseInputsPanel();
-
-      ChangeVisualState( _button.ToString(), true );
-
-      Button closeButton = GetMessageBoxButton( PART_CloseButton );
-      if( closeButton != null )
-        closeButton.IsEnabled = !object.Equals( _button, MessageBoxButton.YesNo );
-
-      Button okButton = GetMessageBoxButton( PART_OkButton );
-      if( okButton != null )
-        okButton.IsCancel = object.Equals( _button, MessageBoxButton.OK );
-
-      SetDefaultResult();
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      base.OnPreviewKeyDown( e );
-
-      // Prevent MenuItem shortcuts while MessageBox is active.
-      if( Keyboard.IsKeyDown( Key.LeftAlt ) || Keyboard.IsKeyDown( Key.RightAlt ) )
-      {
-        e.Handled = true;
-      }
-    }
-
-    protected override object OnCoerceCloseButtonVisibility( Visibility newValue )
-    {
-      if( newValue != Visibility.Visible )
-        throw new InvalidOperationException( "Close button on MessageBox is always Visible." );
-      return newValue;
-    }
-
-    protected override object OnCoerceWindowStyle( WindowStyle newValue )
-    {
-      if( newValue != WindowStyle.SingleBorderWindow )
-        throw new InvalidOperationException( "Window style on MessageBox is not available." );
-      return newValue;
-    }
-
-    internal override void UpdateBlockMouseInputsPanel()
-    {
-      if( _windowControl != null )
-      {
-        _windowControl.IsBlockMouseInputsPanelActive = this.IsBlockMouseInputsPanelActive;
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Methods
-
-    #region Public Static
-
-    #region Show with Window as Owner
-
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText )
-    {
-      return Show( messageText, string.Empty, MessageBoxButton.OK, (Style)null );
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="owner">A System.Windows.Window that represents the owner of the MessageBox</param>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( Window owner, string messageText )
-    {
-      return Show( owner, messageText, string.Empty, MessageBoxButton.OK, (Style) null );
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and title bar caption; and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption )
-    {
-        return Show(messageText, caption, MessageBoxButton.OK, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption )
-    {
-        return Show(owner, messageText, caption, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, Style messageBoxStyle )
-    {
-      return Show( owner, messageText, caption, MessageBoxButton.OK, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button )
-    {
-        return Show(messageText, caption, button, (Style)null);
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
-    {
-      return ShowCore( null, IntPtr.Zero, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
-    }
-
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button )
-    {
-        return Show(owner, messageText, caption, button, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
-    {
-      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
-    }
-
-
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
-    {
-        return Show(messageText, caption, button, icon, (Style)null);
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
-    {
-      return ShowCore( null, IntPtr.Zero, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
-    {
-        return Show(owner, messageText, caption, button, icon, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
-    {
-      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
-    }
-
-
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-        return Show(messageText, caption, button, icon, defaultResult, (Style)null);
-    }
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
-    /// <param name="defaultResult">A System.Windows.MessageBoxResult value that specifies the default result of the MessageBox.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
-    {
-      return ShowCore( null, IntPtr.Zero, messageText, caption, button, icon, defaultResult, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-        return Show(owner, messageText, caption, button, icon, defaultResult, (Style) null);
-    }
-
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
-    {
-      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, icon, defaultResult, messageBoxStyle );
-    }
-
-    #endregion //Show with Window as Owner
-
-    #region Show with Window handle as Owner
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText )
-    {
-      return Show( ownerWindowHandle, messageText, string.Empty, MessageBoxButton.OK, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption )
-    {
-      return Show( ownerWindowHandle, messageText, caption, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, Style messageBoxStyle )
-    {
-      return Show( ownerWindowHandle, messageText, caption, MessageBoxButton.OK, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button )
-    {
-      return Show( ownerWindowHandle, messageText, caption, button, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
-    {
-      return ShowCore( null, ownerWindowHandle, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
-    {
-      return Show( ownerWindowHandle, messageText, caption, button, icon, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
-    {
-      return ShowCore( null, ownerWindowHandle, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-      return Show( ownerWindowHandle, messageText, caption, button, icon, defaultResult, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
-    {
-      return ShowCore( null, ownerWindowHandle, messageText, caption, button, icon, defaultResult, messageBoxStyle );
-    }
-
-    #endregion //Show with Window handle as Owner
-
-    #endregion //Public Static
-
-    #region Public Methods
-    /// <summary>
-    /// Displays this message box when embedded in a WindowContainer parent.
-    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
-    /// </summary>
-    public void ShowMessageBox()
-    {
-      if( this.Container != null || this.Parent == null )
-        throw new InvalidOperationException(
-          "This method is not intended to be called while displaying a MessageBox outside of a WindowContainer. Use ShowDialog() instead in that case." );
-
-      if( !( this.Parent is WindowContainer ) )
-        throw new InvalidOperationException(
-          "The MessageBox instance is not intended to be displayed in a container other than a WindowContainer." );
-
-      _dialogResult = System.Windows.MessageBoxResult.None;
-      this.Visibility = Visibility.Visible;
-    }
-
-    /// <summary>
-    /// Displays this message box when embedded in a WindowContainer parent.
-    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
-    /// </summary>
-    public void ShowMessageBox( string messageText )
-    {
-      this.ShowMessageBoxCore( messageText, string.Empty, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.None );
-    }
-
-    /// <summary>
-    /// Displays this message box when embedded in a WindowContainer parent.
-    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
-    /// </summary>
-    public void ShowMessageBox( string messageText, string caption )
-    {
-      this.ShowMessageBoxCore( messageText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.None );
-    }
-
-    /// <summary>
-    /// Displays this message box when embedded in a WindowContainer parent.
-    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
-    /// </summary>
-    public void ShowMessageBox( string messageText, string caption, MessageBoxButton button )
-    {
-      this.ShowMessageBoxCore( messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None );
-    }
-
-    /// <summary>
-    /// Displays this message box when embedded in a WindowContainer parent.
-    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
-    /// </summary>
-    public void ShowMessageBox( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
-    {
-      this.ShowMessageBoxCore( messageText, caption, button, icon, MessageBoxResult.None );
-    }
-
-    /// <summary>
-    /// Displays this message box when embedded in a WindowContainer parent.
-    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
-    /// </summary>
-    public void ShowMessageBox( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-      this.ShowMessageBoxCore( messageText, caption, button, icon, defaultResult );
-    }
-
-    /// <summary>
-    /// Display the MessageBox window and returns only when this MessageBox closes.
-    /// </summary>
-    public bool? ShowDialog()
-    {
-      if( this.Parent != null )
-        throw new InvalidOperationException(
-          "This method is not intended to be called while displaying a Message Box inside a WindowContainer. Use 'ShowMessageBox()' instead." );
-
-      _dialogResult = System.Windows.MessageBoxResult.None;
-      this.Visibility = Visibility.Visible;
-      this.CreateContainer();
-
-      return this.Container.ShowDialog();
-    }
-
-    #endregion
-
-    #region Protected
-    /// <summary>
-    /// Initializes the MessageBox.
-    /// </summary>
-    /// <param name="owner">The Window owner.</param>
-    /// <param name="ownerHandle">The Window Handle owner.</param>
-    /// <param name="text">The text.</param>
-    /// <param name="caption">The caption.</param>
-    /// <param name="button">The button.</param>
-    /// <param name="image">The image.</param>
-    /// <param name="defaultResult">The MessageBox result as default.</param>
-    protected void InitializeMessageBox( Window owner, IntPtr ownerHandle, string text, string caption, MessageBoxButton button, MessageBoxImage image, MessageBoxResult defaultResult )
-    {
-      Text = text;
-      Caption = caption;
-      _button = button;
-      _defaultResult = defaultResult;
-      _owner = owner;
-      _ownerHandle = ownerHandle;
-      SetImageSource( image );
-    }
-
-    /// <summary>
-    /// Changes the control's visual state(s).
-    /// </summary>
-    /// <param name="name">name of the state</param>
-    /// <param name="useTransitions">True if state transitions should be used.</param>
-    protected void ChangeVisualState( string name, bool useTransitions )
-    {
-      VisualStateManager.GoToState( this, name, useTransitions );
-    }
-
-    #endregion //Protected
-
-
-
-
-
-    #region Private
-
-    private bool IsCurrentWindow( object windowtoTest )
-    {
-      return object.Equals( _windowControl, windowtoTest );
-    }
-
-    /// <summary>
-    /// Closes the MessageBox.
-    /// </summary>
-    private void Close()
-    {
-      if( this.Container != null )
-      {
-        // The Window.Closed event callback will call "OnClose"
-        this.Container.Close();
-      }
-      else
-      {
-        this.OnClose();
-      }
-    }
-
-    /// <summary>
-    /// Sets the button that represents the _defaultResult to the default button and gives it focus.
-    /// </summary>
-    private void SetDefaultResult()
-    {
-      var defaultButton = GetDefaultButtonFromDefaultResult();
-      if( defaultButton != null )
-      {
-        defaultButton.IsDefault = true;
-        defaultButton.Focus();
-      }
-    }
-
-    /// <summary>
-    /// Gets the default button from the _defaultResult.
-    /// </summary>
-    /// <returns>The default button that represents the defaultResult</returns>
-    private Button GetDefaultButtonFromDefaultResult()
-    {
-      Button defaultButton = null;
-      switch( _defaultResult )
-      {
-        case MessageBoxResult.Cancel:
-          defaultButton = GetMessageBoxButton( PART_CancelButton );
-          break;
-        case MessageBoxResult.No:
-          defaultButton = GetMessageBoxButton( PART_NoButton );
-          break;
-        case MessageBoxResult.OK:
-          defaultButton = GetMessageBoxButton( PART_OkButton );
-          break;
-        case MessageBoxResult.Yes:
-          defaultButton = GetMessageBoxButton( PART_YesButton );
-          break;
-        case MessageBoxResult.None:
-          defaultButton = GetDefaultButton();
-          break;
-      }
-      return defaultButton;
-    }
-
-    /// <summary>
-    /// Gets the default button.
-    /// </summary>
-    /// <remarks>Used when the _defaultResult is set to None</remarks>
-    /// <returns>The button to use as the default</returns>
-    private Button GetDefaultButton()
-    {
-      Button defaultButton = null;
-      switch( _button )
-      {
-        case MessageBoxButton.OK:
-        case MessageBoxButton.OKCancel:
-          defaultButton = GetMessageBoxButton( PART_OkButton );
-          break;
-        case MessageBoxButton.YesNo:
-        case MessageBoxButton.YesNoCancel:
-          defaultButton = GetMessageBoxButton( PART_YesButton );
-          break;
-      }
-      return defaultButton;
-    }
-
-    /// <summary>
-    /// Gets a message box button.
-    /// </summary>
-    /// <param name="name">The name of the button to get.</param>
-    /// <returns>The button</returns>
-    private Button GetMessageBoxButton( string name )
-    {
-      Button button = GetTemplateChild( name ) as Button;
-      return button;
-    }
-
-    private void ShowMessageBoxCore( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-      this.InitializeMessageBox( null, IntPtr.Zero, messageText, caption, button, icon, defaultResult );
-      this.ShowMessageBox();
-    }
-
-    private void InitHandlers()
-    {
-      AddHandler( ButtonBase.ClickEvent, new RoutedEventHandler( this.Button_Click ) );
-
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, new ExecutedRoutedEventHandler( ExecuteCopy ) ) );
-    }
-
-    /// <summary>
-    /// Shows the MessageBox.
-    /// </summary>
-    /// <param name="messageText">The message text.</param>
-    /// <param name="caption">The caption.</param>
-    /// <param name="button">The button.</param>
-    /// <param name="icon">The icon.</param>
-    /// <param name="defaultResult">The default result.</param>
-    /// <returns></returns>
-    private static MessageBoxResult ShowCore( Window owner, IntPtr ownerHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
-    {
-      if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
-      {
-        throw new InvalidOperationException( "Static methods for MessageBoxes are not available in XBAP. Use the instance ShowMessageBox methods instead." );
-      }
-
-      if( (owner != null) && (ownerHandle != IntPtr.Zero) )
-      {
-        throw new NotSupportedException( "The owner of a MessageBox can't be both a Window and a WindowHandle." );
-      }
-
-      var msgBox = new MessageBox();
-      msgBox.InitializeMessageBox( owner, ownerHandle, messageText, caption, button, icon, defaultResult );
-
-      // Setting the style to null will inhibit any implicit styles      
-      if( messageBoxStyle != null )
-      {
-        msgBox.Style = messageBoxStyle;
-      }
-
-      msgBox.ShowDialog();
-      return msgBox.MessageBoxResult;
-    }
-
-    private delegate Window ComputeOwnerWindowCoreDelegate();
-
-    /// <summary>
-    /// Resolves the owner Window of the MessageBox.
-    /// </summary>
-    /// <returns>the owner Window</returns>
-    private static Window ComputeOwnerWindow()
-    {
-      Window result = null;
-
-      if( Application.Current != null )
-      {
-        if( Application.Current.Dispatcher.CheckAccess() )
-        {
-          result = ComputeOwnerWindowCore();
-        }
-        else
-        {
-          Application.Current.Dispatcher.BeginInvoke( new Action( () =>
-          {
-            result = ComputeOwnerWindowCore();
-          }
-          ) );
-        }
-      }     
-
-      return result;
-    }
-
-    private static Window ComputeOwnerWindowCore()
-    {
-      Window owner = null;
-
-      if( Application.Current != null )
-      {
-        foreach( Window w in Application.Current.Windows )
-        {
-          if( w.IsActive )
-          {
-            owner = w;
-            break;
-          }
-        }
-      }
-
-      return owner;
-    }
-
-    /// <summary>
-    /// Sets the message image source.
-    /// </summary>
-    /// <param name="image">The image to show.</param>
-    private void SetImageSource( MessageBoxImage image )
-    {
-      String iconName = String.Empty;
-
-      switch( image )
-      {
-        case MessageBoxImage.Error:
-          {
-            iconName = "Error48.png";
-            break;
-          }
-        case MessageBoxImage.Information:
-          {
-            iconName = "Information48.png";
-            break;
-          }
-        case MessageBoxImage.Question:
-          {
-            iconName = "Question48.png";
-            break;
-          }
-        case MessageBoxImage.Warning:
-          {
-            iconName = "Warning48.png";
-            break;
-          }
-        case MessageBoxImage.None:
-        default:
-          {
-            return;
-          }
-      }
-
-      // Use this syntax for other themes to get the icons
-      this.ImageSource = new BitmapImage( new Uri( String.Format( "/Xceed.Wpf.Toolkit;component/MessageBox/Icons/{0}", iconName ), UriKind.RelativeOrAbsolute ) );
-    }
-
-    /// <summary>
-    /// Creates the container which will host the MessageBox control.
-    /// </summary>
-    /// <returns></returns>
-    private Window CreateContainer()
-    {
-      var newWindow = new Window();
-      newWindow.AllowsTransparency = true;
-      newWindow.Background = Brushes.Transparent;
-      newWindow.Content = this;
-
-      if( _ownerHandle != IntPtr.Zero )
-      {
-        var windowHelper = new WindowInteropHelper( newWindow ) { Owner = _ownerHandle };
-        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
-      }
-      else
-      {
-        newWindow.Owner = _owner ?? ComputeOwnerWindow();
-        if( newWindow.Owner != null )
-          newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
-        else
-          newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
-      }
-
-      newWindow.ShowInTaskbar = false;
-      newWindow.SizeToContent = System.Windows.SizeToContent.WidthAndHeight;
-      newWindow.ResizeMode = System.Windows.ResizeMode.NoResize;
-      newWindow.WindowStyle = System.Windows.WindowStyle.None;
-      newWindow.Closed += new EventHandler( OnContainerClosed );
-      return newWindow;
-    }
-
-    #endregion //Private
-
-    #endregion //Methods
-
-    #region Event Handlers
-
-    /// <summary>
-    /// Processes the move of a drag operation on the header.
-    /// </summary>
-    /// <param name="e">The <see cref="System.Windows.Controls.Primitives.DragDeltaEventArgs"/> instance containing the event data.</param>
-    protected virtual void OnHeaderDragDelta( DragDeltaEventArgs e )
-    {
-      if( !this.IsCurrentWindow( e.OriginalSource ) )
-        return;
-
-      e.Handled = true;
-
-      DragDeltaEventArgs args = new DragDeltaEventArgs( e.HorizontalChange, e.VerticalChange );
-      args.RoutedEvent = HeaderDragDeltaEvent;
-      args.Source = this;
-      this.RaiseEvent( args );
-
-      if( !args.Handled )
-      {
-        if( this.Container == null )
-        {
-          double left = 0.0;
-
-          if( this.FlowDirection == System.Windows.FlowDirection.RightToLeft )
-            left = this.Left - e.HorizontalChange;
-          else
-            left = this.Left + e.HorizontalChange;
-
-          this.Left = left;
-          this.Top += e.VerticalChange;
-        }
-        else
-        {
-          double left = 0.0;
-
-          if( this.FlowDirection == System.Windows.FlowDirection.RightToLeft )
-            left = Container.Left - e.HorizontalChange;
-          else
-            left = Container.Left + e.HorizontalChange;
-
-          Container.Left = left;
-          Container.Top += e.VerticalChange;
-        }
-      }
-    }
-
-    /// <summary>
-    /// Processes the double-click on the header.
-    /// </summary>
-    /// <param name="e">The <see cref="System.Windows.Input.Primitives.MouseButtonEventArgs"/> instance containing the event data.</param>
-    protected virtual void OnHeaderIconDoubleClicked( MouseButtonEventArgs e )
-    {
-      if( !this.IsCurrentWindow( e.OriginalSource ) )
-        return;
-
-      e.Handled = true;
-
-      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
-      args.RoutedEvent = HeaderIconDoubleClickedEvent;
-      args.Source = this;
-      this.RaiseEvent( args );
-
-      if( !args.Handled )
-      {
-        this.Close();
-      }
-    }
-
-    /// <summary>
-    /// Processes the close button click.
-    /// </summary>
-    /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
-    protected virtual void OnCloseButtonClicked( RoutedEventArgs e )
-    {
-      if( !this.IsCurrentWindow( e.OriginalSource ) )
-        return;
-
-      e.Handled = true;
-
-      _dialogResult = object.Equals( _button, MessageBoxButton.OK )
-                             ? MessageBoxResult.OK
-                             : MessageBoxResult.Cancel;
-
-      RoutedEventArgs args = new RoutedEventArgs( CloseButtonClickedEvent, this );
-      this.RaiseEvent( args );
-
-      if( !args.Handled )
-      {
-        this.Close();
-      }
-    }
-
-    /// <summary>
-    /// Sets the MessageBoxResult according to the button pressed and then closes the MessageBox.
-    /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
-    private void Button_Click( object sender, RoutedEventArgs e )
-    {
-      Button button = e.OriginalSource as Button;
-
-      if( button == null )
-        return;
-
-      switch( button.Name )
-      {
-        case PART_NoButton:
-          _dialogResult = MessageBoxResult.No;
-          this.Close();
-          break;
-        case PART_YesButton:
-          _dialogResult = MessageBoxResult.Yes;
-          this.Close();
-          break;
-        case PART_CancelButton:
-          _dialogResult = MessageBoxResult.Cancel;
-          this.Close();
-          break;
-        case PART_OkButton:
-          _dialogResult = MessageBoxResult.OK;
-          this.Close();
-          break;
-      }
-
-      e.Handled = true;
-    }
-
-    /// <summary>
-    /// Callack to the Container.Closed event
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void OnContainerClosed( object sender, EventArgs e )
-    {
-      this.Container.Closed -= this.OnContainerClosed;
-      this.Container.Content = null;
-      Debug.Assert( this.Container == null );
-      this.OnClose();
-    }
-
-    private void OnClose()
-    {
-      this.Visibility = Visibility.Collapsed;
-      this.OnClosed( EventArgs.Empty );
-    }
-
-    private void MessageBox_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      if( (bool)e.NewValue )
-      {
-        Action action = () =>
-        {
-          //Focus first Focusable Child element of MessageBox to prevent Tab outside MessageBox.
-          var defaultButton = this.GetDefaultButtonFromDefaultResult();
-          if( defaultButton != null )
-          {
-            defaultButton.Focus();
-          }
-        };
-
-        Dispatcher.BeginInvoke( DispatcherPriority.ApplicationIdle, action );
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Events
-
-    /// <summary>
-    /// Occurs when the MessageBox is closed.
-    /// </summary>
-    public event EventHandler Closed;
-    protected virtual void OnClosed( EventArgs e )
-    {
-      if( Closed != null )
-        Closed( this, e );
-    }
-
-
-    #endregion
-
-    #region COMMANDS
-
-    private void ExecuteCopy( object sender, ExecutedRoutedEventArgs e )
-    {
-      StringBuilder sb = new StringBuilder();
-      sb.Append( "---------------------------" );
-      sb.AppendLine();
-      sb.Append( Caption );
-      sb.AppendLine();
-      sb.Append( "---------------------------" );
-      sb.AppendLine();
-      sb.Append( Text );
-      sb.AppendLine();
-      sb.Append( "---------------------------" );
-      sb.AppendLine();
-      switch( _button )
-      {
-        case MessageBoxButton.OK:
-          sb.Append( OkButtonContent.ToString() );
-          break;
-        case MessageBoxButton.OKCancel:
-          sb.Append( OkButtonContent + "     " + CancelButtonContent );
-          break;
-        case MessageBoxButton.YesNo:
-          sb.Append( YesButtonContent + "     " + NoButtonContent );
-          break;
-        case MessageBoxButton.YesNoCancel:
-          sb.Append( YesButtonContent + "     " + NoButtonContent + "     " + CancelButtonContent );
-          break;
-      }
-      sb.AppendLine();
-      sb.Append( "---------------------------" );
-
-      try
-      {
-        new UIPermission( UIPermissionClipboard.AllClipboard ).Demand();
-        Clipboard.SetText( sb.ToString() );
-      }
-      catch( SecurityException )
-      {
-        throw new SecurityException();
-      }
-    }
-
-    #endregion COMMANDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
deleted file mode 100644
index 56b91413..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal static partial class VisualStates
-  {
-    public const string MessageBoxButtonsGroup = "MessageBoxButtonsGroup";
-    public const string OK = "OK";
-    public const string OKCancel = "OKCancel";
-    public const string YesNo = "YesNo";
-    public const string YesNoCancel = "YesNoCancel";
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 5f514cef..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,238 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Primitives/Themes/Aero2/WindowControl.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- MessageBox                                                                      -->
-  <!-- =============================================================================== -->
-
-  <ControlTemplate x:Key="MessageBoxTemplate"
-                   TargetType="{x:Type local:MessageBox}">
-    <Grid>
-      <VisualStateManager.VisualStateGroups>
-        <VisualStateGroup x:Name="group1">
-          <VisualState x:Name="OK">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton"
-                                             Storyboard.TargetProperty="Visibility">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-          <VisualState x:Name="OKCancel">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton"
-                                             Storyboard.TargetProperty="Visibility">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton"
-                                             Storyboard.TargetProperty="Visibility">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-          <VisualState x:Name="YesNo">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton"
-                                             Storyboard.TargetProperty="Visibility">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton"
-                                             Storyboard.TargetProperty="Visibility">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-          <VisualState x:Name="YesNoCancel">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton"
-                                             Storyboard.TargetProperty="Visibility">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton"
-                                             Storyboard.TargetProperty="Visibility">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton"
-                                             Storyboard.TargetProperty="Visibility">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-        </VisualStateGroup>
-      </VisualStateManager.VisualStateGroups>
-
-      <prim:WindowControl x:Name="PART_WindowControl"
-                          Caption="{TemplateBinding Caption}"
-                          CaptionFontSize="{TemplateBinding CaptionFontSize}"
-                          CaptionForeground="{TemplateBinding CaptionForeground}"
-                          CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}"
-                          CaptionIcon="{TemplateBinding CaptionIcon}"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          IsActive="{TemplateBinding IsActive}"
-                          WindowBackground="{TemplateBinding WindowBackground}"
-                          WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}"
-                          WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
-                          WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
-                          CloseButtonStyle="{TemplateBinding CloseButtonStyle}"
-                          WindowOpacity="{TemplateBinding WindowOpacity}">
-        <prim:WindowControl.Content>
-          <Grid MinWidth="350">
-            <Grid.RowDefinitions>
-              <RowDefinition />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Grid Margin="24,16,24,22">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-
-              <!-- Message Image -->
-              <Image x:Name="MessageBoxImage"
-                     VerticalAlignment="Top"
-                     SnapsToDevicePixels="True"
-                     Stretch="None"
-                     Source="{TemplateBinding ImageSource}">
-              </Image>
-
-              <!-- Message Text -->
-              <ScrollViewer Grid.Column="1"
-                            VerticalScrollBarVisibility="Auto">
-                <TextBlock x:Name="MessageText"
-                           TextWrapping="Wrap"
-                           VerticalAlignment="Center"
-                           MaxWidth="450"
-                           Text="{TemplateBinding Text}"
-                           FontFamily="{TemplateBinding FontFamily}"
-                           FontSize="{TemplateBinding FontSize}"
-                           FontStyle="{TemplateBinding FontStyle}"
-                           FontWeight="{TemplateBinding FontWeight}"
-                           Foreground="{TemplateBinding Foreground}"
-                           Margin="10,0,0,0" />
-              </ScrollViewer>
-            </Grid>
-
-            <!-- Buttons -->
-            <Border Grid.Row="1"
-                    Background="{TemplateBinding ButtonRegionBackground}">
-              <Grid HorizontalAlignment="Right"
-                    Margin="12">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <Button Grid.Column="0"
-                        x:Name="PART_YesButton"
-                        MinWidth="65"
-                        Margin="6,0,0,0"
-                        Visibility="Collapsed"
-                        Content="{TemplateBinding YesButtonContent}"
-                        Style="{TemplateBinding YesButtonStyle}" />
-                <Button Grid.Column="1"
-                        x:Name="PART_NoButton"
-                        MinWidth="65"
-                        Margin="6,0,0,0"
-                        Visibility="Collapsed"
-                        Content="{TemplateBinding NoButtonContent}"
-                        Style="{TemplateBinding NoButtonStyle}" />
-                <Button Grid.Column="2"
-                        x:Name="PART_OkButton"
-                        MinWidth="65"
-                        Margin="6,0,0,0"
-                        Visibility="Collapsed"
-                        Content="{TemplateBinding OkButtonContent}"
-                        Style="{TemplateBinding OkButtonStyle}" />
-                <Button Grid.Column="3"
-                        x:Name="PART_CancelButton"
-                        MinWidth="65"
-                        Margin="6,0,0,0"
-                        Visibility="Collapsed"
-                        Content="{TemplateBinding CancelButtonContent}"
-                        Style="{TemplateBinding CancelButtonStyle}"
-                        IsCancel="True" />
-              </Grid>
-            </Border>
-          </Grid>
-        </prim:WindowControl.Content>
-      </prim:WindowControl>
-    </Grid>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:MessageBox}"
-         BasedOn="{StaticResource {x:Type prim:WindowControl}}">
-    <Setter Property="ButtonRegionBackground"
-            Value="#FFF0F0F0" />
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="MinWidth"
-            Value="350" />
-    <Setter Property="MinHeight"
-            Value="50" />
-    <Setter Property="MaxHeight"
-            Value="250" />
-    <Setter Property="Template"
-            Value="{StaticResource MessageBoxTemplate}" />
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
deleted file mode 100644
index 5c3d3796..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,238 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Generic/Common.xaml" />
-    <ResourceDictionary Source="../../Primitives/Themes/Generic/WindowControl.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- MessageBox                                                                      -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:MessageBox}"
-         BasedOn="{StaticResource {x:Type prim:WindowControl}}">
-    <Setter Property="ButtonRegionBackground"
-            Value="#FFF0F0F0" />
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="MinWidth"
-            Value="350" />
-    <Setter Property="MinHeight"
-            Value="50" />
-    <Setter Property="MaxHeight"
-            Value="250" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:MessageBox}">
-          <Grid>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="group1">
-                <VisualState x:Name="OK">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton"
-                                                   Storyboard.TargetProperty="Visibility">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="OKCancel">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton"
-                                                   Storyboard.TargetProperty="Visibility">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton"
-                                                   Storyboard.TargetProperty="Visibility">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="YesNo">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton"
-                                                   Storyboard.TargetProperty="Visibility">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton"
-                                                   Storyboard.TargetProperty="Visibility">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="YesNoCancel">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton"
-                                                   Storyboard.TargetProperty="Visibility">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton"
-                                                   Storyboard.TargetProperty="Visibility">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton"
-                                                   Storyboard.TargetProperty="Visibility">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-
-            <prim:WindowControl x:Name="PART_WindowControl"
-                                Caption="{TemplateBinding Caption}"
-                                CaptionFontSize="{TemplateBinding CaptionFontSize}"
-                                CaptionForeground="{TemplateBinding CaptionForeground}"
-                                CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}"
-                                CaptionIcon="{TemplateBinding CaptionIcon}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                IsActive="{TemplateBinding IsActive}"
-                                WindowBackground="{TemplateBinding WindowBackground}"
-                                WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}"
-                                WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
-                                WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
-                                CloseButtonStyle="{TemplateBinding CloseButtonStyle}"
-                                WindowOpacity="{TemplateBinding WindowOpacity}">
-              <prim:WindowControl.Content>
-                <Grid MinWidth="350">
-                  <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-
-                  <Grid Margin="24,16,24,22">
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="Auto" />
-                      <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <!-- Message Image -->
-                    <Image x:Name="MessageBoxImage"
-                           VerticalAlignment="Top"
-                           SnapsToDevicePixels="True"
-                           Stretch="None"
-                           Source="{TemplateBinding ImageSource}" >
-                    </Image>
-
-                    <!-- Message Text -->
-                    <ScrollViewer Grid.Column="1"
-                                  VerticalScrollBarVisibility="Auto">
-                      <TextBlock x:Name="MessageText"
-                                 TextWrapping="Wrap"
-                                 VerticalAlignment="Center"
-                                 MaxWidth="450"
-                                 Text="{TemplateBinding Text}"
-                                 FontFamily="{TemplateBinding FontFamily}"
-                                 FontSize="{TemplateBinding FontSize}"
-                                 FontStyle="{TemplateBinding FontStyle}"
-                                 FontWeight="{TemplateBinding FontWeight}"
-                                 Foreground="{TemplateBinding Foreground}"
-                                 Margin="10,0,0,0" />
-                    </ScrollViewer>
-                  </Grid>
-
-                  <!-- Buttons -->
-                  <Border Grid.Row="1"
-                          Background="{TemplateBinding ButtonRegionBackground}">
-                    <Grid HorizontalAlignment="Right"
-                          Margin="12">
-                      <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                      </Grid.ColumnDefinitions>
-
-                      <Button Grid.Column="0"
-                              x:Name="PART_YesButton"
-                              MinWidth="65"
-                              Margin="6,0,0,0"
-                              Visibility="Collapsed"
-                              Content="{TemplateBinding YesButtonContent}"
-                              Style="{TemplateBinding YesButtonStyle}" />
-                      <Button Grid.Column="1"
-                              x:Name="PART_NoButton"
-                              MinWidth="65"
-                              Margin="6,0,0,0"
-                              Visibility="Collapsed"
-                              Content="{TemplateBinding NoButtonContent}"
-                              Style="{TemplateBinding NoButtonStyle}" />
-                      <Button Grid.Column="2"
-                              x:Name="PART_OkButton"
-                              MinWidth="65"
-                              Margin="6,0,0,0"
-                              Visibility="Collapsed"
-                              Content="{TemplateBinding OkButtonContent}"
-                              Style="{TemplateBinding OkButtonStyle}" />
-                      <Button Grid.Column="3"
-                              x:Name="PART_CancelButton"
-                              MinWidth="65"
-                              Margin="6,0,0,0"
-                              Visibility="Collapsed"
-                              Content="{TemplateBinding CancelButtonContent}"
-                              Style="{TemplateBinding CancelButtonStyle}"
-                              IsCancel="True" />
-                    </Grid>
-                  </Border>
-                </Grid>
-              </prim:WindowControl.Content>
-            </prim:WindowControl>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png
deleted file mode 100644
index ebfaee36..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
deleted file mode 100644
index 39780891..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_ResizeThumb, Type = typeof( Thumb ) )]
-  [TemplatePart( Name = PART_TextBox, Type = typeof( TextBox ) )]
-  [TemplatePart( Name = PART_DropDownButton, Type = typeof( ToggleButton ) )]
-  public class MultiLineTextEditor : ContentControl
-  {
-    private const string PART_ResizeThumb = "PART_ResizeThumb";
-    private const string PART_TextBox = "PART_TextBox";
-    private const string PART_DropDownButton = "PART_DropDownButton";
-
-    #region Members
-
-    private Thumb _resizeThumb;
-    private TextBox _textBox;
-    private ToggleButton _toggleButton;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region DropDownHeight
-    public static readonly DependencyProperty DropDownHeightProperty = DependencyProperty.Register( "DropDownHeight", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 150.0 ) );
-    public double DropDownHeight
-    {
-      get
-      {
-        return ( double )GetValue( DropDownHeightProperty );
-      }
-      set
-      {
-        SetValue( DropDownHeightProperty, value );
-      }
-    }
-    #endregion DropDownHeight
-
-    #region DropDownWidth
-    public static readonly DependencyProperty DropDownWidthProperty = DependencyProperty.Register( "DropDownWidth", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 200.0 ) );
-    public double DropDownWidth
-    {
-      get
-      {
-        return ( double )GetValue( DropDownWidthProperty );
-      }
-      set
-      {
-        SetValue( DropDownWidthProperty, value );
-      }
-    }
-    #endregion DropDownWidth
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MultiLineTextEditor multiLineTextEditor = o as MultiLineTextEditor;
-      if( multiLineTextEditor != null )
-        multiLineTextEditor.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      if( _textBox != null )
-      {
-        // Focus the content of the popup, after its loaded
-        Dispatcher.BeginInvoke( new Action( () => _textBox.Focus() ), DispatcherPriority.Background );
-      }
-    }
-
-    #endregion //IsOpen
-
-    #region IsSpellCheckEnabled
-    public static readonly DependencyProperty IsSpellCheckEnabledProperty = DependencyProperty.Register( "IsSpellCheckEnabled", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false ) );
-    public bool IsSpellCheckEnabled
-    {
-      get
-      {
-        return ( bool )GetValue( IsSpellCheckEnabledProperty );
-      }
-      set
-      {
-        SetValue( IsSpellCheckEnabledProperty, value );
-      }
-    }
-    #endregion IsSpellCheckEnabled
-
-    #region IsReadOnly
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-    #endregion IsReadOnly
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MultiLineTextEditor ), new FrameworkPropertyMetadata( String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextChanged ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MultiLineTextEditor textEditor = o as MultiLineTextEditor;
-      if( textEditor != null )
-        textEditor.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnTextChanged( string oldValue, string newValue )
-    {
-
-    }
-
-    #endregion //Text
-
-    #region TextAlignment
-    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextAlignment.Left ) );
-    public TextAlignment TextAlignment
-    {
-      get
-      {
-        return ( TextAlignment )GetValue( TextAlignmentProperty );
-      }
-      set
-      {
-        SetValue( TextAlignmentProperty, value );
-      }
-    }
-    #endregion TextAlignment
-
-    #region TextWrapping
-    public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register( "TextWrapping", typeof( TextWrapping ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextWrapping.NoWrap ) );
-    public TextWrapping TextWrapping
-    {
-      get
-      {
-        return ( TextWrapping )GetValue( TextWrappingProperty );
-      }
-      set
-      {
-        SetValue( TextWrappingProperty, value );
-      }
-    }
-    #endregion TextWrapping
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static MultiLineTextEditor()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( MultiLineTextEditor ), new FrameworkPropertyMetadata( typeof( MultiLineTextEditor ) ) );
-    }
-
-    public MultiLineTextEditor()
-    {
-      Keyboard.AddKeyDownHandler( this, OnKeyDown );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-    }
-
-    #endregion //Constructors
-
-    #region Bass Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _resizeThumb != null )
-        _resizeThumb.DragDelta -= ResizeThumb_DragDelta;
-
-      _resizeThumb = GetTemplateChild( PART_ResizeThumb ) as Thumb;
-
-      if( _resizeThumb != null )
-        _resizeThumb.DragDelta += ResizeThumb_DragDelta;
-
-      _textBox = GetTemplateChild( PART_TextBox ) as TextBox;
-      _toggleButton = GetTemplateChild( PART_DropDownButton ) as ToggleButton;
-    }
-
-
-
-
-    #endregion //Bass Class Overrides
-
-    #region Event Handlers
-
-    private void OnKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsOpen = true;
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e )
-          || ( e.Key == Key.Escape )
-          || ( e.Key == Key.Tab ) )
-        {
-          CloseEditor();
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      CloseEditor();
-    }
-
-    void ResizeThumb_DragDelta( object sender, DragDeltaEventArgs e )
-    {
-      double yadjust = DropDownHeight + e.VerticalChange;
-      double xadjust = DropDownWidth + e.HorizontalChange;
-
-      if( ( xadjust >= 0 ) && ( yadjust >= 0 ) )
-      {
-        DropDownWidth = xadjust;
-        DropDownHeight = yadjust;
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void CloseEditor()
-    {
-      if( IsOpen )
-        IsOpen = false;
-      ReleaseMouseCapture();
-
-      if( _toggleButton != null )
-      {
-        _toggleButton.Focus();
-      }
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 2fbc03ae..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,217 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <Image x:Key="DefaultContent"
-         x:Shared="False"
-         Height="16"
-         Width="18"
-         Source="./../Images/Notes16.png" />
-
-  <Style x:Key="ToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-
-              <Border Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Padding="{TemplateBinding Padding}"
-                      SnapsToDevicePixels="True">
-                <ContentPresenter Content="{TemplateBinding Content}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-              </Border>
-
-              <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                   Grid.Column="1"
-                                   CornerRadius="0"
-                                   RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
-                                   RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
-                                   RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                   RenderPressed="{TemplateBinding IsPressed}">
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-
-  <!-- =============================================================================== -->
-  <!-- MultiLineTextEditor                                                             -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:MultiLineTextEditor}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="Content"
-            Value="{StaticResource DefaultContent}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Padding"
-            Value="2,0,0,0" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:MultiLineTextEditor}">
-          <Grid x:Name="Root">
-            <ToggleButton x:Name="PART_DropDownButton"
-                          Grid.Column="1"
-                          IsTabStop="True"
-                          MinHeight="22"
-                          SnapsToDevicePixels="True"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          Padding="{TemplateBinding Padding}"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource ToggleButtonStyle}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}">
-            </ToggleButton>
-            <Popup IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
-                   StaysOpen="False"
-                   Placement="Bottom"
-                   SnapsToDevicePixels="True"
-                   AllowsTransparency="True"
-                   Focusable="False"
-                   PopupAnimation="Slide"
-                   Width="{TemplateBinding DropDownWidth}"
-                   Height="{TemplateBinding DropDownHeight}"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="White"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}">
-                <Grid>
-                  <TextBox x:Name="PART_TextBox"
-                           AcceptsReturn="true"
-                           TextWrapping="{TemplateBinding TextWrapping}"
-                           Padding="{TemplateBinding Padding}"
-                           VerticalScrollBarVisibility="Auto"
-                           HorizontalScrollBarVisibility="Auto"
-                           SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
-                           IsReadOnly="{TemplateBinding IsReadOnly}"
-                           Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                           TextAlignment="{TemplateBinding TextAlignment}"
-                           Margin="3">
-                  </TextBox>
-                  <Thumb x:Name="PART_ResizeThumb"
-                         HorizontalAlignment="Right"
-                         VerticalAlignment="Bottom"
-                         Cursor="SizeNWSE">
-                    <Thumb.Template>
-                      <ControlTemplate TargetType="{x:Type Thumb}">
-                        <Grid Background="Transparent">
-                          <Path Data="M0.5,6.5 L6.5,0.5 M6.5,3.5 L3.5,6.5"
-                                Stroke="Black"
-                                StrokeThickness="1" />
-                        </Grid>
-                      </ControlTemplate>
-                    </Thumb.Template>
-                  </Thumb>
-                </Grid>
-              </Border>
-            </Popup>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver"
-               Value="True">
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-      </Trigger>
-      <Trigger Property="IsKeyboardFocusWithin"
-               Value="True">
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
deleted file mode 100644
index 378ade61..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
+++ /dev/null
@@ -1,236 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <Image x:Key="DefaultContent"
-         x:Shared="False"
-         Height="16"
-         Width="18"
-         Source="./../Images/Notes16.png" />
-
-  <LinearGradientBrush x:Key="PopupDarkBorderBrush"
-                       EndPoint="0.5,1"
-                       StartPoint="0.5,0">
-    <GradientStop Color="#FFA3AEB9"
-                  Offset="0" />
-    <GradientStop Color="#FF8399A9"
-                  Offset="0.375" />
-    <GradientStop Color="#FF718597"
-                  Offset="0.375" />
-    <GradientStop Color="#FF617584"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <Style x:Key="ToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-
-              <Border Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Padding="{TemplateBinding Padding}"
-                      SnapsToDevicePixels="True">
-                <ContentPresenter Content="{TemplateBinding Content}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-              </Border>
-
-              <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                   Grid.Column="1"
-                                   CornerRadius="0,2.75,2.75,0"
-                                   RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
-                                   RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
-                                   RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                   RenderPressed="{TemplateBinding IsPressed}">
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="Gray" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:MultiLineTextEditor}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderBrush">
-      <Setter.Value>
-        <LinearGradientBrush EndPoint="0.5,1"
-                             StartPoint="0.5,0">
-          <GradientStop Color="#FFA3AEB9"
-                        Offset="0" />
-          <GradientStop Color="#FF8399A9"
-                        Offset="0.375" />
-          <GradientStop Color="#FF718597"
-                        Offset="0.375" />
-          <GradientStop Color="#FF617584"
-                        Offset="1" />
-        </LinearGradientBrush>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="Content"
-            Value="{StaticResource DefaultContent}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Padding"
-            Value="2,0,0,0" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:MultiLineTextEditor}">
-          <Grid x:Name="Root">
-            <ToggleButton x:Name="PART_DropDownButton"
-                          Grid.Column="1"
-                          IsTabStop="True"
-                          MinHeight="22"
-                          SnapsToDevicePixels="True"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          Padding="{TemplateBinding Padding}"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource ToggleButtonStyle}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}">
-            </ToggleButton>
-            <Popup IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
-                   StaysOpen="False"
-                   Placement="Bottom"
-                   SnapsToDevicePixels="True"
-                   AllowsTransparency="True"
-                   Focusable="False"
-                   PopupAnimation="Slide"
-                   Width="{TemplateBinding DropDownWidth}"
-                   Height="{TemplateBinding DropDownHeight}"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{StaticResource PopupBackgroundBrush}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}">
-                <Grid>
-                  <TextBox x:Name="PART_TextBox"
-                           AcceptsReturn="true"
-                           TextWrapping="{TemplateBinding TextWrapping}"
-                           Padding="{TemplateBinding Padding}"
-                           VerticalScrollBarVisibility="Auto"
-                           HorizontalScrollBarVisibility="Auto"
-                           SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
-                           IsReadOnly="{TemplateBinding IsReadOnly}"
-                           Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                           TextAlignment="{TemplateBinding TextAlignment}"
-                           Margin="3" >
-                  </TextBox>
-                  <Thumb x:Name="PART_ResizeThumb"
-                         HorizontalAlignment="Right"
-                         VerticalAlignment="Bottom"
-                         Cursor="SizeNWSE">
-                    <Thumb.Template>
-                      <ControlTemplate TargetType="{x:Type Thumb}">
-                        <Grid Background="Transparent">
-                          <Path Data="M0.5,6.5 L6.5,0.5 M6.5,3.5 L3.5,6.5"
-                                Stroke="Black"
-                                StrokeThickness="1" />
-                        </Grid>
-                      </ControlTemplate>
-                    </Thumb.Template>
-                  </Thumb>
-                </Grid>
-              </Border>
-            </Popup>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
deleted file mode 100644
index 5eb4628f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [Flags]
-  public enum AllowedSpecialValues
-  {
-    None = 0,
-    NaN = 1,
-    PositiveInfinity = 2,
-    NegativeInfinity = 4,
-    AnyInfinity = PositiveInfinity | NegativeInfinity,
-    Any = NaN | AnyInfinity
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
deleted file mode 100644
index f18b2847..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ByteUpDown : CommonNumericUpDown<byte>
-  {
-    #region Constructors
-
-    static ByteUpDown()
-    {
-      UpdateMetadata( typeof( ByteUpDown ), ( byte )1, byte.MinValue, byte.MaxValue );
-    }
-
-    public ByteUpDown()
-      : base( Byte.TryParse, Decimal.ToByte, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override byte IncrementValue( byte value, byte increment )
-    {
-      return ( byte )( value + increment );
-    }
-
-    protected override byte DecrementValue( byte value, byte increment )
-    {
-      return ( byte )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
deleted file mode 100644
index d197c875..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
+++ /dev/null
@@ -1,407 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public abstract class CommonNumericUpDown<T> : NumericUpDown<T?> where T : struct, IFormattable, IComparable<T>
-  {
-    protected delegate bool FromText( string s, NumberStyles style, IFormatProvider provider, out T result );
-    protected delegate T FromDecimal( decimal d );
-
-    #region Private Members
-
-    private FromText _fromText;
-    private FromDecimal _fromDecimal;
-    private Func<T, T, bool> _fromLowerThan;
-    private Func<T, T, bool> _fromGreaterThan;
-
-    #endregion
-
-    #region Properties
-
-    #region IsInvalid
-
-    internal static readonly DependencyProperty IsInvalidProperty = DependencyProperty.Register( "IsInvalid", typeof( bool ), typeof( CommonNumericUpDown<T> ), new UIPropertyMetadata( false ) );
-    internal bool IsInvalid
-    {
-      get
-      {
-        return ( bool )GetValue( IsInvalidProperty );
-      }
-      private set
-      {
-        SetValue( IsInvalidProperty, value );
-      }
-    }
-
-    #endregion //IsInvalid
-
-    #region ParsingNumberStyle
-
-    public static readonly DependencyProperty ParsingNumberStyleProperty =
-        DependencyProperty.Register( "ParsingNumberStyle", typeof( NumberStyles ), typeof( CommonNumericUpDown<T> ), new UIPropertyMetadata( NumberStyles.Any ) );
-
-    public NumberStyles ParsingNumberStyle
-    {
-      get { return ( NumberStyles )GetValue( ParsingNumberStyleProperty ); }
-      set { SetValue( ParsingNumberStyleProperty, value ); }
-    }
-
-    #endregion //ParsingNumberStyle
-
-    #endregion
-
-    #region Constructors
-
-    protected CommonNumericUpDown( FromText fromText, FromDecimal fromDecimal, Func<T, T, bool> fromLowerThan, Func<T, T, bool> fromGreaterThan )
-    {
-      if( fromText == null )
-        throw new ArgumentNullException( "tryParseMethod" );
-
-      if( fromDecimal == null )
-        throw new ArgumentNullException( "fromDecimal" );
-
-      if( fromLowerThan == null )
-        throw new ArgumentNullException( "fromLowerThan" );
-
-      if( fromGreaterThan == null )
-        throw new ArgumentNullException( "fromGreaterThan" );
-
-      _fromText = fromText;
-      _fromDecimal = fromDecimal;
-      _fromLowerThan = fromLowerThan;
-      _fromGreaterThan = fromGreaterThan;
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    protected static void UpdateMetadata( Type type, T? increment, T? minValue, T? maxValue )
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( type ) );
-      UpdateMetadataCommon( type, increment, minValue, maxValue );
-    }
-
-    protected void TestInputSpecialValue( AllowedSpecialValues allowedValues, AllowedSpecialValues valueToCompare )
-    {
-      if( ( allowedValues & valueToCompare ) != valueToCompare )
-      {
-        switch( valueToCompare )
-        {
-          case AllowedSpecialValues.NaN:
-            throw new InvalidDataException( "Value to parse shouldn't be NaN." );
-          case AllowedSpecialValues.PositiveInfinity:
-            throw new InvalidDataException( "Value to parse shouldn't be Positive Infinity." );
-          case AllowedSpecialValues.NegativeInfinity:
-            throw new InvalidDataException( "Value to parse shouldn't be Negative Infinity." );
-        }
-      }
-    }
-
-    internal bool IsBetweenMinMax( T? value )
-    {
-      return !IsLowerThan( value, Minimum ) && !IsGreaterThan( value, Maximum );
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private static void UpdateMetadataCommon( Type type, T? increment, T? minValue, T? maxValue )
-    {
-      IncrementProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( increment ) );
-      MaximumProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( maxValue ) );
-      MinimumProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( minValue ) );
-    }
-
-    private bool IsLowerThan( T? value1, T? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return _fromLowerThan( value1.Value, value2.Value );
-    }
-
-    private bool IsGreaterThan( T? value1, T? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return _fromGreaterThan( value1.Value, value2.Value );
-    }
-
-    private bool HandleNullSpin()
-    {
-      if( !Value.HasValue )
-      {
-        T forcedValue = ( DefaultValue.HasValue )
-          ? DefaultValue.Value
-          : default( T );
-
-        Value = CoerceValueMinMax( forcedValue );
-
-        return true;
-      }
-      else if( !Increment.HasValue )
-      {
-        return true;
-      }
-
-      return false;
-    }
-
-    private T? CoerceValueMinMax( T value )
-    {
-      if( IsLowerThan( value, Minimum ) )
-        return Minimum;
-      else if( IsGreaterThan( value, Maximum ) )
-        return Maximum;
-      else
-        return value;
-    }
-
-    #endregion
-
-    #region Base Class Overrides
-
-    protected override void OnIncrement()
-    {
-      if( !HandleNullSpin() )
-      {
-        // if UpdateValueOnEnterKey is true, 
-        // Sync Value on Text only when Enter Key is pressed.
-        if( this.UpdateValueOnEnterKey )
-        {
-          var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-          var result = this.IncrementValue( currentValue.Value, Increment.Value );
-          var newValue = this.CoerceValueMinMax( result );
-          this.TextBox.Text = newValue.Value.ToString( this.FormatString, this.CultureInfo );
-        }
-        else
-        {
-          var result = this.IncrementValue( Value.Value, Increment.Value );
-          this.Value = this.CoerceValueMinMax( result );
-        }
-      }
-    }
-
-    protected override void OnDecrement()
-    {
-      if( !HandleNullSpin() )
-      {
-        // if UpdateValueOnEnterKey is true, 
-        // Sync Value on Text only when Enter Key is pressed.
-        if( this.UpdateValueOnEnterKey )
-        {
-          var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-          var result = this.DecrementValue( currentValue.Value, Increment.Value );
-          var newValue = this.CoerceValueMinMax( result );
-          this.TextBox.Text = newValue.Value.ToString( this.FormatString, this.CultureInfo );
-        }
-        else
-        {
-          var result = this.DecrementValue( Value.Value, Increment.Value );
-          this.Value = this.CoerceValueMinMax( result );
-        }
-      }
-    }
-
-    protected override void OnMinimumChanged( T? oldValue, T? newValue )
-    {
-      base.OnMinimumChanged( oldValue, newValue );
-
-      if( this.Value.HasValue && this.ClipValueToMinMax )
-      {
-        this.Value = this.CoerceValueMinMax( this.Value.Value );
-      }
-    }
-
-    protected override void OnMaximumChanged( T? oldValue, T? newValue )
-    {
-      base.OnMaximumChanged( oldValue, newValue );
-
-      if( this.Value.HasValue && this.ClipValueToMinMax )
-      {
-        this.Value = this.CoerceValueMinMax( this.Value.Value );
-      }
-    }
-
-    protected override T? ConvertTextToValue( string text )
-    {
-      T? result = null;
-
-      if( String.IsNullOrEmpty( text ) )
-        return result;
-
-      // Since the conversion from Value to text using a FormartString may not be parsable,
-      // we verify that the already existing text is not the exact same value.
-      string currentValueText = ConvertValueToText();
-      if( object.Equals( currentValueText, text ) )
-      {
-        this.IsInvalid = false;
-        return this.Value;
-      }
-
-      result = this.ConvertTextToValueCore( currentValueText, text );
-
-      if( this.ClipValueToMinMax )
-      {
-        return this.GetClippedMinMaxValue( result );
-      }
-
-      ValidateDefaultMinMax( result );
-
-      return result;
-    }
-
-    protected override string ConvertValueToText()
-    {
-      if( Value == null )
-        return string.Empty;
-
-      this.IsInvalid = false;
-
-      //Manage FormatString of type "{}{0:N2} °" (in xaml) or "{0:N2} °" in code-behind.
-      if( FormatString.Contains( "{0" ) )
-        return string.Format( CultureInfo, FormatString, Value.Value );
-
-      return Value.Value.ToString( FormatString, CultureInfo );
-    }
-
-    protected override void SetValidSpinDirection()
-    {
-      ValidSpinDirections validDirections = ValidSpinDirections.None;
-
-      // Null increment always prevents spin.
-      if( (this.Increment != null) && !IsReadOnly )
-      {
-        if( IsLowerThan( Value, Maximum ) || !Value.HasValue || !Maximum.HasValue)
-          validDirections = validDirections | ValidSpinDirections.Increase;
-
-        if( IsGreaterThan( Value, Minimum ) || !Value.HasValue || !Minimum.HasValue )
-          validDirections = validDirections | ValidSpinDirections.Decrease;
-      }
-
-      if( Spinner != null )
-        Spinner.ValidSpinDirection = validDirections;
-    }
-
-    private bool IsPercent( string stringToTest )
-    {
-      int PIndex = stringToTest.IndexOf( "P" );
-      if( PIndex >= 0 )
-      {
-        //stringToTest contains a "P" between 2 "'", it's considered as text, not percent
-        bool isText = (stringToTest.Substring( 0, PIndex ).Contains( "'" )
-                      && stringToTest.Substring( PIndex, FormatString.Length - PIndex ).Contains( "'" ));
-
-        return !isText;
-      }
-      return false;
-    }
-
-    private T? ConvertTextToValueCore( string currentValueText, string text )
-    {
-      T? result;
-
-      if( this.IsPercent( this.FormatString ) )
-      {
-        result = _fromDecimal( ParsePercent( text, CultureInfo ) );
-      }
-      else
-      {
-        T outputValue = new T();
-        // Problem while converting new text
-        if( !_fromText( text, this.ParsingNumberStyle, CultureInfo, out outputValue ) )
-        {
-          bool shouldThrow = true;
-
-          // case 164198: Throw when replacing only the digit part of 99° through UI.
-          // Check if CurrentValueText is also failing => it also contains special characters. ex : 90°
-          T currentValueTextOutputValue;
-          if( !_fromText( currentValueText, this.ParsingNumberStyle, CultureInfo, out currentValueTextOutputValue ) )
-          {
-            // extract non-digit characters
-            var currentValueTextSpecialCharacters = currentValueText.Where( c => !Char.IsDigit( c ) );
-            if( currentValueTextSpecialCharacters.Count() > 0 )
-            {
-              var textSpecialCharacters = text.Where( c => !Char.IsDigit( c ) );
-              // same non-digit characters on currentValueText and new text => remove them on new Text to parse it again.
-              if( currentValueTextSpecialCharacters.Except( textSpecialCharacters ).ToList().Count == 0 )
-              {
-                foreach( var character in textSpecialCharacters )
-                {
-                  text = text.Replace( character.ToString(), string.Empty );
-                }
-                // if without the special characters, parsing is good, do not throw
-                if( _fromText( text, this.ParsingNumberStyle, CultureInfo, out outputValue ) )
-                {
-                  shouldThrow = false;
-                }
-              }
-            }
-          }
-
-          if( shouldThrow )
-          {
-            this.IsInvalid = true;
-            throw new InvalidDataException( "Input string was not in a correct format." );
-          }
-        }
-        result = outputValue;
-      }
-      return result;
-    }
-
-    private T? GetClippedMinMaxValue( T? result )
-    {
-      if( this.IsGreaterThan( result, this.Maximum ) )
-        return this.Maximum;
-      else if( this.IsLowerThan( result, this.Minimum ) )
-        return this.Minimum;
-      return result;
-    }
-
-    private void ValidateDefaultMinMax( T? value )
-    {
-      // DefaultValue is always accepted.
-      if( object.Equals( value, DefaultValue ) )
-        return;
-
-      if( IsLowerThan( value, Minimum ) )
-        throw new ArgumentOutOfRangeException( "Minimum", String.Format( "Value must be greater than MinValue of {0}", Minimum ) );
-      else if( IsGreaterThan( value, Maximum ) )
-        throw new ArgumentOutOfRangeException( "Maximum", String.Format( "Value must be less than MaxValue of {0}", Maximum ) );
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Abstract Methods
-
-    protected abstract T IncrementValue( T value, T increment );
-
-    protected abstract T DecrementValue( T value, T increment );
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
deleted file mode 100644
index 7806ce2a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class DecimalUpDown : CommonNumericUpDown<decimal>
-  {
-    #region Constructors
-
-    static DecimalUpDown()
-    {
-      UpdateMetadata( typeof( DecimalUpDown ), 1m, decimal.MinValue, decimal.MaxValue );
-    }
-
-    public DecimalUpDown()
-      : base( Decimal.TryParse, ( d ) => d, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override decimal IncrementValue( decimal value, decimal increment )
-    {
-      return value + increment;
-    }
-
-    protected override decimal DecrementValue( decimal value, decimal increment )
-    {
-      return value - increment;
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
deleted file mode 100644
index 8b6e4b85..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Globalization;
-using System.IO;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class DoubleUpDown : CommonNumericUpDown<double>
-  {
-    #region Constructors
-
-    static DoubleUpDown()
-    {
-      UpdateMetadata( typeof( DoubleUpDown ), 1d, double.NegativeInfinity, double.PositiveInfinity );
-    }
-
-    public DoubleUpDown()
-      : base( Double.TryParse, Decimal.ToDouble, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-
-    #region AllowInputSpecialValues
-
-    public static readonly DependencyProperty AllowInputSpecialValuesProperty =
-        DependencyProperty.Register( "AllowInputSpecialValues", typeof( AllowedSpecialValues ), typeof( DoubleUpDown ), new UIPropertyMetadata( AllowedSpecialValues.None ) );
-
-    public AllowedSpecialValues AllowInputSpecialValues
-    {
-      get { return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty ); }
-      set { SetValue( AllowInputSpecialValuesProperty, value ); }
-    }
-
-    #endregion //AllowInputSpecialValues
-
-    #endregion
-
-    #region Base Class Overrides
-
-    protected override double? OnCoerceIncrement( double? baseValue )
-    {
-      if( baseValue.HasValue && double.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Increment." );
-
-      return base.OnCoerceIncrement( baseValue );
-    }
-
-    protected override double? OnCoerceMaximum( double? baseValue )
-    {
-      if( baseValue.HasValue && double.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Maximum." );
-
-      return base.OnCoerceMaximum( baseValue );
-    }
-
-    protected override double? OnCoerceMinimum( double? baseValue )
-    {
-      if( baseValue.HasValue && double.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Minimum." );
-
-      return base.OnCoerceMinimum( baseValue );
-    }
-
-    protected override double IncrementValue( double value, double increment )
-    {
-      return value + increment;
-    }
-
-    protected override double DecrementValue( double value, double increment )
-    {
-      return value - increment;
-    }
-
-    protected override void SetValidSpinDirection()
-    {
-      if( Value.HasValue && double.IsInfinity( Value.Value ) && ( Spinner != null ) )
-      {
-        Spinner.ValidSpinDirection = ValidSpinDirections.None;
-      }
-      else
-      {
-        base.SetValidSpinDirection();
-      }
-    }
-
-    protected override double? ConvertTextToValue( string text )
-    {
-      double? result = base.ConvertTextToValue( text );
-      if( result != null )
-      {
-        if( double.IsNaN( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.NaN );
-        else if( double.IsPositiveInfinity( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.PositiveInfinity );
-        else if( double.IsNegativeInfinity( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.NegativeInfinity );
-      }
-
-      return result;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
deleted file mode 100644
index 8ba2d64b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class IntegerUpDown : CommonNumericUpDown<int>
-  {
-    #region Constructors
-
-    static IntegerUpDown()
-    {
-      UpdateMetadata( typeof( IntegerUpDown ), 1, int.MinValue, int.MaxValue );
-    }
-
-    public IntegerUpDown()
-      : base( Int32.TryParse, Decimal.ToInt32, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override int IncrementValue( int value, int increment )
-    {
-      return value + increment;
-    }
-
-    protected override int DecrementValue( int value, int increment )
-    {
-      return value - increment;
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
deleted file mode 100644
index e76846ad..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class LongUpDown : CommonNumericUpDown<long>
-  {
-    #region Constructors
-
-    static LongUpDown()
-    {
-      UpdateMetadata( typeof( LongUpDown ), 1L, long.MinValue, long.MaxValue );
-    }
-
-    public LongUpDown()
-      : base( Int64.TryParse, Decimal.ToInt64, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override long IncrementValue( long value, long increment )
-    {
-      return value + increment;
-    }
-
-    protected override long DecrementValue( long value, long increment )
-    {
-      return value - increment;
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
deleted file mode 100644
index 0d9e0de5..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Primitives;
-
-
-namespace Xceed.Wpf.Toolkit
-{
-  public abstract class NumericUpDown<T> : UpDownBase<T>
-  {
-#pragma warning disable 0618
-
-    #region Properties
-
-    #region AutoMoveFocus
-
-    public bool AutoMoveFocus
-    {
-      get
-      {
-        return ( bool )GetValue( AutoMoveFocusProperty );
-      }
-      set
-      {
-        SetValue( AutoMoveFocusProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty AutoMoveFocusProperty =
-        DependencyProperty.Register( "AutoMoveFocus", typeof( bool ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( false ) );
-
-    #endregion AutoMoveFocus
-
-    #region AutoSelectBehavior
-
-    public AutoSelectBehavior AutoSelectBehavior
-    {
-      get
-      {
-        return ( AutoSelectBehavior )GetValue( AutoSelectBehaviorProperty );
-      }
-      set
-      {
-        SetValue( AutoSelectBehaviorProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty AutoSelectBehaviorProperty =
-        DependencyProperty.Register( "AutoSelectBehavior", typeof( AutoSelectBehavior ), typeof( NumericUpDown<T> ),
-      new UIPropertyMetadata( AutoSelectBehavior.OnFocus ) );
-
-    #endregion AutoSelectBehavior PROPERTY
-
-    #region FormatString
-
-    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( String.Empty, OnFormatStringChanged ) );
-    public string FormatString
-    {
-      get
-      {
-        return ( string )GetValue( FormatStringProperty );
-      }
-      set
-      {
-        SetValue( FormatStringProperty, value );
-      }
-    }
-
-    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
-      if( numericUpDown != null )
-        numericUpDown.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
-    {
-      if( IsInitialized )
-      {
-        this.SyncTextAndValueProperties( false, null );
-      }
-    }
-
-    #endregion //FormatString
-
-    #region Increment
-
-    public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register( "Increment", typeof( T ), typeof( NumericUpDown<T> ), new PropertyMetadata( default( T ), OnIncrementChanged, OnCoerceIncrement ) );
-    public T Increment
-    {
-      get
-      {
-        return ( T )GetValue( IncrementProperty );
-      }
-      set
-      {
-        SetValue( IncrementProperty, value );
-      }
-    }
-
-    private static void OnIncrementChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
-      if( numericUpDown != null )
-        numericUpDown.OnIncrementChanged( ( T )e.OldValue, ( T )e.NewValue );
-    }
-
-    protected virtual void OnIncrementChanged( T oldValue, T newValue )
-    {
-      if( this.IsInitialized )
-      {
-        SetValidSpinDirection();
-      }
-    }
-
-    private static object OnCoerceIncrement( DependencyObject d, object baseValue )
-    {
-      NumericUpDown<T> numericUpDown = d as NumericUpDown<T>;
-      if( numericUpDown != null )
-        return numericUpDown.OnCoerceIncrement( ( T )baseValue );
-
-      return baseValue;
-    }
-
-    protected virtual T OnCoerceIncrement( T baseValue )
-    {
-      return baseValue;
-    }
-
-    #endregion
-
-    #region MaxLength
-
-    public static readonly DependencyProperty MaxLengthProperty = DependencyProperty.Register( "MaxLength", typeof( int ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( 0 ) );
-    public int MaxLength
-    {
-      get
-      {
-        return ( int )GetValue( MaxLengthProperty );
-      }
-      set
-      {
-        SetValue( MaxLengthProperty, value );
-      }
-    }
-
-    #endregion //MaxLength
-
-    #endregion //Properties
-
-    #region Overrides
-
-
-    #endregion
-
-    #region Methods
-
-    protected static decimal ParsePercent( string text, IFormatProvider cultureInfo )
-    {
-      NumberFormatInfo info = NumberFormatInfo.GetInstance( cultureInfo );
-
-      text = text.Replace( info.PercentSymbol, null );
-
-      decimal result = Decimal.Parse( text, NumberStyles.Any, info );
-      result = result / 100;
-
-      return result;
-    }
-
-    #endregion //Methods
-  }
-
-#pragma warning restore 0618
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
deleted file mode 100644
index f15e28cf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class SByteUpDown : CommonNumericUpDown<sbyte>
-  {
-    #region Constructors
-
-    static SByteUpDown()
-    {
-      UpdateMetadata( typeof( SByteUpDown ), ( sbyte )1, sbyte.MinValue, sbyte.MaxValue );
-    }
-
-    public SByteUpDown()
-      : base( sbyte.TryParse, Decimal.ToSByte, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override sbyte IncrementValue( sbyte value, sbyte increment )
-    {
-      return ( sbyte )( value + increment );
-    }
-
-    protected override sbyte DecrementValue( sbyte value, sbyte increment )
-    {
-      return ( sbyte )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
deleted file mode 100644
index 39ecc075..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ShortUpDown : CommonNumericUpDown<short>
-  {
-    #region Constructors
-
-    static ShortUpDown()
-    {
-      UpdateMetadata( typeof( ShortUpDown ), ( short )1, short.MinValue, short.MaxValue );
-    }
-
-    public ShortUpDown()
-      : base( Int16.TryParse, Decimal.ToInt16, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override short IncrementValue( short value, short increment )
-    {
-      return ( short )( value + increment );
-    }
-
-    protected override short DecrementValue( short value, short increment )
-    {
-      return ( short )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
deleted file mode 100644
index 462a880c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Globalization;
-using System.IO;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class SingleUpDown : CommonNumericUpDown<float>
-  {
-    #region Constructors
-
-    static SingleUpDown()
-    {
-      UpdateMetadata( typeof( SingleUpDown ), 1f, float.NegativeInfinity, float.PositiveInfinity );
-    }
-
-    public SingleUpDown()
-      : base( Single.TryParse, Decimal.ToSingle, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region AllowInputSpecialValues
-
-    public static readonly DependencyProperty AllowInputSpecialValuesProperty =
-        DependencyProperty.Register( "AllowInputSpecialValues", typeof( AllowedSpecialValues ), typeof( SingleUpDown ), new UIPropertyMetadata( AllowedSpecialValues.None ) );
-
-    public AllowedSpecialValues AllowInputSpecialValues
-    {
-      get { return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty ); }
-      set { SetValue( AllowInputSpecialValuesProperty, value ); }
-    }
-
-    #endregion //AllowInputSpecialValues
-
-    #endregion
-
-    #region Base Class Overrides
-
-    protected override float? OnCoerceIncrement( float? baseValue )
-    {
-      if( baseValue.HasValue && float.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Increment." );
-
-      return base.OnCoerceIncrement( baseValue );
-    }
-
-    protected override float? OnCoerceMaximum( float? baseValue )
-    {
-      if( baseValue.HasValue && float.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Maximum." );
-
-      return base.OnCoerceMaximum( baseValue );
-    }
-
-    protected override float? OnCoerceMinimum( float? baseValue )
-    {
-      if( baseValue.HasValue && float.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Minimum." );
-
-      return base.OnCoerceMinimum( baseValue );
-    }
-
-    protected override float IncrementValue( float value, float increment )
-    {
-      return value + increment;
-    }
-
-    protected override float DecrementValue( float value, float increment )
-    {
-      return value - increment;
-    }
-
-    protected override void SetValidSpinDirection()
-    {
-      if( Value.HasValue && float.IsInfinity( Value.Value ) && ( Spinner != null ) )
-      {
-        Spinner.ValidSpinDirection = ValidSpinDirections.None;
-      }
-      else
-      {
-        base.SetValidSpinDirection();
-      }
-    }
-
-    protected override float? ConvertTextToValue( string text )
-    {
-      float? result = base.ConvertTextToValue( text );
-
-      if( result != null )
-      {
-        if( float.IsNaN( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.NaN );
-        else if( float.IsPositiveInfinity( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.PositiveInfinity );
-        else if( float.IsNegativeInfinity( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.NegativeInfinity );
-      }
-
-      return result;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
deleted file mode 100644
index c2ecc707..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class UIntegerUpDown : CommonNumericUpDown<uint>
-  {
-    #region Constructors
-
-    static UIntegerUpDown()
-    {
-      UpdateMetadata( typeof( UIntegerUpDown ), ( uint )1, uint.MinValue, uint.MaxValue );
-    }
-
-    public UIntegerUpDown()
-      : base( uint.TryParse, Decimal.ToUInt32, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override uint IncrementValue( uint value, uint increment )
-    {
-      return ( uint )( value + increment );
-    }
-
-    protected override uint DecrementValue( uint value, uint increment )
-    {
-      return ( uint )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
deleted file mode 100644
index 185050cb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class ULongUpDown : CommonNumericUpDown<ulong>
-  {
-    #region Constructors
-
-    static ULongUpDown()
-    {
-      UpdateMetadata( typeof( ULongUpDown ), ( ulong )1, ulong.MinValue, ulong.MaxValue );
-    }
-
-    public ULongUpDown()
-      : base( ulong.TryParse, Decimal.ToUInt64, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override ulong IncrementValue( ulong value, ulong increment )
-    {
-      return ( ulong )( value + increment );
-    }
-
-    protected override ulong DecrementValue( ulong value, ulong increment )
-    {
-      return ( ulong )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
deleted file mode 100644
index c3992441..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class UShortUpDown : CommonNumericUpDown<ushort>
-  {
-    #region Constructors
-
-    static UShortUpDown()
-    {
-      UpdateMetadata( typeof( UShortUpDown ), ( ushort )1, ushort.MinValue, ushort.MaxValue );
-    }
-
-    public UShortUpDown()
-      : base( ushort.TryParse, Decimal.ToUInt16, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override ushort IncrementValue( ushort value, ushort increment )
-    {
-      return ( ushort )( value + increment );
-    }
-
-    protected override ushort DecrementValue( ushort value, ushort increment )
-    {
-      return ( ushort )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index b2e8549f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,214 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                    Focusable="False"
-                    Margin="0,0,3,0" />
-  </DataTemplate>
-
-  <Style x:Key="NumericUpDown"
-         TargetType="{x:Type prim:InputBase}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Control">
-          <local:ButtonSpinner x:Name="PART_Spinner"
-                               IsTabStop="False"
-                               Background="{TemplateBinding Background}"
-                               BorderThickness="{TemplateBinding BorderThickness}"
-                               BorderBrush="{TemplateBinding BorderBrush}"
-                               HorizontalContentAlignment="Stretch"
-                               VerticalContentAlignment="Stretch"
-                               AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
-                               ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}"
-                               ButtonSpinnerLocation="{Binding ButtonSpinnerLocation, RelativeSource={RelativeSource TemplatedParent}}">
-            <local:WatermarkTextBox x:Name="PART_TextBox"
-                                    BorderThickness="0"
-                                    Background="Transparent"
-                                    ContextMenu="{TemplateBinding ContextMenu}"
-                                    FontFamily="{TemplateBinding FontFamily}"
-                                    FontSize="{TemplateBinding FontSize}"
-                                    FontStretch="{TemplateBinding FontStretch}"
-                                    FontStyle="{TemplateBinding FontStyle}"
-                                    FontWeight="{TemplateBinding FontWeight}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                    IsTabStop="True"
-                                    MinWidth="20"
-                                    AcceptsReturn="False"
-                                    Padding="{TemplateBinding Padding}"
-                                    AutoSelectBehavior="{Binding AutoSelectBehavior, RelativeSource={RelativeSource TemplatedParent}}"
-                                    AutoMoveFocus="{Binding AutoMoveFocus, RelativeSource={RelativeSource TemplatedParent}}"
-                                    TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
-                                    TextWrapping="NoWrap"
-                                    TabIndex="{TemplateBinding TabIndex}"
-                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
-                                    WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                    MaxLength="{Binding MaxLength, RelativeSource={RelativeSource TemplatedParent}}">
-            </local:WatermarkTextBox>
-          </local:ButtonSpinner>
-
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <Trigger Property="IsKeyboardFocusWithin"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsFocused"
-                     Value="True">
-              <Setter TargetName="PART_TextBox"
-                      Property="FocusManager.FocusedElement"
-                      Value="{Binding ElementName=PART_TextBox}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- =============================================================================== -->
-  <!-- DecimalUpDown                                                                   -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:DecimalUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- DoubleUpDown                                                                    -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:DoubleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- IntegerUpDown                                                                   -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:IntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- ShortUpDown                                                                     -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:ShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- LongUpDown                                                                      -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:LongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- ByteUpDown                                                                      -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:ByteUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- SingleUpDown                                                                    -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:SingleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- ===============================================================================   -->
-  <!-- Style for all internal derived types of NumericUpDown will be done in code-behind -->
-  <!-- for external themes to redefine the default style. The reason is that the         -->
-  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
-  <!-- available in code-behind (not xaml).                                              -->
-  <!-- (ex. Office2007 theme)                                                            -->
-  <!-- ===============================================================================   -->
-
-  <!-- =============================================================================== -->
-  <!-- SByteUpDown                                                                     -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:SByteUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- UIntegerUpDown                                                                  -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:UIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- ULongUpDown                                                                     -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:ULongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- UShortUpDown                                                                    -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:UShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
deleted file mode 100644
index cebeb172..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
+++ /dev/null
@@ -1,202 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="Gray"
-                    Focusable="False"
-                    Margin="0,0,3,0" />
-  </DataTemplate>
-
-  <Style x:Key="NumericUpDown"
-         TargetType="{x:Type prim:InputBase}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Control">
-          <local:ButtonSpinner x:Name="PART_Spinner"
-                               IsTabStop="False"
-                               Background="{TemplateBinding Background}"
-                               BorderThickness="{TemplateBinding BorderThickness}"
-                               BorderBrush="{TemplateBinding BorderBrush}"
-                               HorizontalContentAlignment="Stretch"
-                               VerticalContentAlignment="Stretch"
-                               AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
-                               ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}"
-                               ButtonSpinnerLocation="{Binding ButtonSpinnerLocation, RelativeSource={RelativeSource TemplatedParent}}">
-            <local:WatermarkTextBox x:Name="PART_TextBox"
-                                    BorderThickness="0"
-                                    Background="Transparent"
-                                    ContextMenu="{TemplateBinding ContextMenu}"
-                                    FontFamily="{TemplateBinding FontFamily}"
-                                    FontSize="{TemplateBinding FontSize}"
-                                    FontStretch="{TemplateBinding FontStretch}"
-                                    FontStyle="{TemplateBinding FontStyle}"
-                                    FontWeight="{TemplateBinding FontWeight}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                    IsTabStop="True"
-                                    MinWidth="20"
-                                    AcceptsReturn="False"
-                                    Padding="{TemplateBinding Padding}"
-                                    AutoSelectBehavior="{Binding AutoSelectBehavior, RelativeSource={RelativeSource TemplatedParent}}"
-                                    AutoMoveFocus="{Binding AutoMoveFocus, RelativeSource={RelativeSource TemplatedParent}}"
-                                    TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
-                                    TextWrapping="NoWrap"
-                                    TabIndex="{TemplateBinding TabIndex}"
-                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
-                                    WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                    MaxLength="{Binding MaxLength, RelativeSource={RelativeSource TemplatedParent}}">
-            </local:WatermarkTextBox>
-          </local:ButtonSpinner>
-          <ControlTemplate.Triggers>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsFocused"
-                     Value="True">
-              <Setter TargetName="PART_TextBox"
-                      Property="FocusManager.FocusedElement"
-                      Value="{Binding ElementName=PART_TextBox}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- =============================================================================== -->
-  <!-- DecimalUpDown                                                                   -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:DecimalUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- DoubleUpDown                                                                    -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:DoubleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- IntegerUpDown                                                                   -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:IntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- ShortUpDown                                                                     -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:ShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- LongUpDown                                                                      -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:LongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- ByteUpDown                                                                      -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:ByteUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- SingleUpDown                                                                    -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:SingleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- ===============================================================================   -->
-  <!-- Style for all internal derived types of NumericUpDown will be done in code-behind -->
-  <!-- for external themes to redefine the default style. The reason is that the         -->
-  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
-  <!-- available in code-behind (not xaml).                                              -->
-  <!-- (ex. Office2007 theme)                                                            -->
-  <!-- ===============================================================================   -->
-
-  <!-- =============================================================================== -->
-  <!-- SByteUpDown                                                                     -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:SByteUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- UIntegerUpDown                                                                  -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:UIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- ULongUpDown                                                                     -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:ULongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- UShortUpDown                                                                    -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:UShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
deleted file mode 100644
index b118f7fb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ /dev/null
@@ -1,723 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit.Obselete
-{
-  [Obsolete("Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead.", true)]
-  public class MaskedTextBox : TextBox
-  {
-    #region Members
-
-    /// <summary>
-    /// Flags if the Text and Value properties are in the process of being sync'd
-    /// </summary>
-    private bool _isSyncingTextAndValueProperties;
-    private bool _isInitialized;
-    private bool _convertExceptionOccurred = false;
-
-    #endregion //Members
-
-    #region Properties
-
-    protected MaskedTextProvider MaskProvider
-    {
-      get;
-      set;
-    }
-
-    #region IncludePrompt
-
-    public static readonly DependencyProperty IncludePromptProperty = DependencyProperty.Register( "IncludePrompt", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( false, OnIncludePromptPropertyChanged ) );
-    public bool IncludePrompt
-    {
-      get
-      {
-        return ( bool )GetValue( IncludePromptProperty );
-      }
-      set
-      {
-        SetValue( IncludePromptProperty, value );
-      }
-    }
-
-    private static void OnIncludePromptPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnIncludePromptChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIncludePromptChanged( bool oldValue, bool newValue )
-    {
-      UpdateMaskProvider( Mask );
-    }
-
-    #endregion //IncludePrompt
-
-    #region IncludeLiterals
-
-    public static readonly DependencyProperty IncludeLiteralsProperty = DependencyProperty.Register( "IncludeLiterals", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( true, OnIncludeLiteralsPropertyChanged ) );
-    public bool IncludeLiterals
-    {
-      get
-      {
-        return ( bool )GetValue( IncludeLiteralsProperty );
-      }
-      set
-      {
-        SetValue( IncludeLiteralsProperty, value );
-      }
-    }
-
-    private static void OnIncludeLiteralsPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnIncludeLiteralsChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIncludeLiteralsChanged( bool oldValue, bool newValue )
-    {
-      UpdateMaskProvider( Mask );
-    }
-
-    #endregion //IncludeLiterals
-
-    #region Mask
-
-    public static readonly DependencyProperty MaskProperty = DependencyProperty.Register( "Mask", typeof( string ), typeof( MaskedTextBox ), new UIPropertyMetadata( "<>", OnMaskPropertyChanged ) );
-    public string Mask
-    {
-      get
-      {
-        return ( string )GetValue( MaskProperty );
-      }
-      set
-      {
-        SetValue( MaskProperty, value );
-      }
-    }
-
-    private static void OnMaskPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnMaskChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnMaskChanged( string oldValue, string newValue )
-    {
-      UpdateMaskProvider( newValue );
-      UpdateText( 0 );
-    }
-
-    #endregion //Mask
-
-    #region PromptChar
-
-    public static readonly DependencyProperty PromptCharProperty = DependencyProperty.Register( "PromptChar", typeof( char ), typeof( MaskedTextBox ), new UIPropertyMetadata( '_', OnPromptCharChanged ) );
-    public char PromptChar
-    {
-      get
-      {
-        return ( char )GetValue( PromptCharProperty );
-      }
-      set
-      {
-        SetValue( PromptCharProperty, value );
-      }
-    }
-
-    private static void OnPromptCharChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnPromptCharChanged( ( char )e.OldValue, ( char )e.NewValue );
-    }
-
-    protected virtual void OnPromptCharChanged( char oldValue, char newValue )
-    {
-      UpdateMaskProvider( Mask );
-    }
-
-    #endregion //PromptChar
-
-    #region SelectAllOnGotFocus
-
-    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
-    public bool SelectAllOnGotFocus
-    {
-      get
-      {
-        return ( bool )GetValue( SelectAllOnGotFocusProperty );
-      }
-      set
-      {
-        SetValue( SelectAllOnGotFocusProperty, value );
-      }
-    }
-
-    #endregion //SelectAllOnGotFocus
-
-    #region Text
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox inputBase = o as MaskedTextBox;
-      if( inputBase != null )
-        inputBase.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnTextChanged( string oldValue, string newValue )
-    {
-      if( _isInitialized )
-        SyncTextAndValueProperties( MaskedTextBox.TextProperty, newValue );
-    }
-
-    #endregion //Text
-
-    #region Value
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( MaskedTextBox ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
-    public object Value
-    {
-      get
-      {
-        return ( object )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
-    }
-
-    protected virtual void OnValueChanged( object oldValue, object newValue )
-    {
-      if( _isInitialized )
-        SyncTextAndValueProperties( MaskedTextBox.ValueProperty, newValue );
-
-      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
-      args.RoutedEvent = MaskedTextBox.ValueChangedEvent;
-      RaiseEvent( args );
-    }
-
-    #endregion //Value
-
-    #region ValueType
-
-    public static readonly DependencyProperty ValueTypeProperty = DependencyProperty.Register( "ValueType", typeof( Type ), typeof( MaskedTextBox ), new UIPropertyMetadata( typeof( String ), OnValueTypeChanged ) );
-    public Type ValueType
-    {
-      get
-      {
-        return ( Type )GetValue( ValueTypeProperty );
-      }
-      set
-      {
-        SetValue( ValueTypeProperty, value );
-      }
-    }
-
-    private static void OnValueTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnValueTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
-    }
-
-    protected virtual void OnValueTypeChanged( Type oldValue, Type newValue )
-    {
-      if( _isInitialized )
-        SyncTextAndValueProperties( MaskedTextBox.TextProperty, Text );
-    }
-
-    #endregion //ValueType
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static MaskedTextBox()
-    {
-      TextProperty.OverrideMetadata( typeof( MaskedTextBox ), new FrameworkPropertyMetadata( OnTextChanged ) );
-    }
-
-    public MaskedTextBox()
-    {
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Paste, Paste ) ); //handle paste
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Cut, null, CanCut ) ); //surpress cut
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      UpdateMaskProvider( Mask );
-      UpdateText( 0 );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-
-      if( !_isInitialized )
-      {
-        _isInitialized = true;
-        SyncTextAndValueProperties( ValueProperty, Value );
-      }
-    }
-
-    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      if( SelectAllOnGotFocus )
-      {
-        SelectAll();
-      }
-
-      base.OnGotKeyboardFocus( e );
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( !e.Handled )
-      {
-        HandlePreviewKeyDown( e );
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnPreviewTextInput( TextCompositionEventArgs e )
-    {
-      if( !e.Handled )
-      {
-        HandlePreviewTextInput( e );
-      }
-
-      base.OnPreviewTextInput( e );
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Events
-
-    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( MaskedTextBox ) );
-    public event RoutedPropertyChangedEventHandler<object> ValueChanged
-    {
-      add
-      {
-        AddHandler( ValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ValueChangedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Methods
-
-    #region Private
-
-    private void UpdateText()
-    {
-      UpdateText( SelectionStart );
-    }
-
-    private void UpdateText( int position )
-    {
-      MaskedTextProvider provider = MaskProvider;
-      if( provider == null )
-        throw new InvalidOperationException();
-
-      Text = provider.ToDisplayString();
-      SelectionLength = 0;
-      SelectionStart = position;
-    }
-
-    private int GetNextCharacterPosition( int startPosition )
-    {
-      int position = MaskProvider.FindEditPositionFrom( startPosition, true );
-      return position == -1 ? startPosition : position;
-    }
-
-    private void UpdateMaskProvider( string mask )
-    {
-      //do not create a mask provider if the Mask is empty, which can occur if the IncludePrompt and IncludeLiterals properties
-      //are set prior to the Mask.
-      if( String.IsNullOrEmpty( mask ) )
-        return;
-
-      MaskProvider = new MaskedTextProvider( mask )
-      {
-        IncludePrompt = this.IncludePrompt,
-        IncludeLiterals = this.IncludeLiterals,
-        PromptChar = this.PromptChar,
-        ResetOnSpace = false //should make this a property
-      };
-    }
-
-    private object ConvertTextToValue( string text )
-    {
-      object convertedValue = null;
-
-      Type dataType = ValueType;
-
-      string valueToConvert = MaskProvider.ToString().Trim();
-
-      try
-      {
-        if( valueToConvert.GetType() == dataType || dataType.IsInstanceOfType( valueToConvert ) )
-        {
-          convertedValue = valueToConvert;
-        }
-#if !VS2008
-        else if( String.IsNullOrWhiteSpace( valueToConvert ) )
-        {
-          convertedValue = Activator.CreateInstance( dataType );
-        }
-#else
-        else if ( String.IsNullOrEmpty( valueToConvert ) )
-        {
-          convertedValue = Activator.CreateInstance( dataType );
-        }
-#endif
-        else if( null == convertedValue && valueToConvert is IConvertible )
-        {
-          convertedValue = Convert.ChangeType( valueToConvert, dataType );
-        }
-      }
-      catch
-      {
-        //if an excpetion occurs revert back to original value
-        _convertExceptionOccurred = true;
-        return Value;
-      }
-
-      return convertedValue;
-    }
-
-    private string ConvertValueToText( object value )
-    {
-      if( value == null )
-        value = string.Empty;
-
-      if( _convertExceptionOccurred )
-      {
-        value = Value;
-        _convertExceptionOccurred = false;
-      }
-
-      //I have only seen this occur while in Blend, but we need it here so the Blend designer doesn't crash.
-      if( MaskProvider == null )
-        return value.ToString();
-
-      MaskProvider.Set( value.ToString() );
-      return MaskProvider.ToDisplayString();
-    }
-
-    private void SyncTextAndValueProperties( DependencyProperty p, object newValue )
-    {
-      //prevents recursive syncing properties
-      if( _isSyncingTextAndValueProperties )
-        return;
-
-      _isSyncingTextAndValueProperties = true;
-
-      //this only occures when the user typed in the value
-      if( MaskedTextBox.TextProperty == p )
-      {
-        if( newValue != null )
-          SetValue( MaskedTextBox.ValueProperty, ConvertTextToValue( newValue.ToString() ) );
-      }
-
-      SetValue( MaskedTextBox.TextProperty, ConvertValueToText( newValue ) );
-
-      _isSyncingTextAndValueProperties = false;
-    }
-
-    private void HandlePreviewTextInput( TextCompositionEventArgs e )
-    {
-      if( !IsReadOnly )
-      {
-        this.InsertText( e.Text );
-      }
-
-      e.Handled = true;
-    }
-
-    private void HandlePreviewKeyDown( KeyEventArgs e )
-    {
-      if( e.Key == Key.Delete )
-      {
-        e.Handled = IsReadOnly
-                 || HandleKeyDownDelete();
-      }
-      else if( e.Key == Key.Back )
-      {
-        e.Handled = IsReadOnly
-                 || HandleKeyDownBack();
-      }
-      else if( e.Key == Key.Space )
-      {
-        if( !IsReadOnly )
-        {
-          InsertText( " " );
-        }
-
-        e.Handled = true;
-      }
-      else if( e.Key == Key.Return || e.Key == Key.Enter )
-      {
-        if( !IsReadOnly && AcceptsReturn )
-        {
-          this.InsertText( "\r" );
-        }
-
-        // We don't want the OnPreviewTextInput to be triggered for the Return/Enter key
-        // when it is not accepted.
-        e.Handled = true;
-      }
-      else if( e.Key == Key.Escape )
-      {
-        // We don't want the OnPreviewTextInput to be triggered at all for the Escape key.
-        e.Handled = true;
-      }
-      else if( e.Key == Key.Tab )
-      {
-        if( AcceptsTab )
-        {
-          if( !IsReadOnly )
-          {
-            this.InsertText( "\t" );
-          }
-
-          e.Handled = true;
-        }
-      }
-    }
-
-    private bool HandleKeyDownDelete()
-    {
-      ModifierKeys modifiers = Keyboard.Modifiers;
-      bool handled = true;
-
-      if( modifiers == ModifierKeys.None )
-      {
-        if( !RemoveSelectedText() )
-        {
-          int position = SelectionStart;
-
-          if( position < Text.Length )
-          {
-            RemoveText( position, 1 );
-            UpdateText( position );
-          }
-        }
-        else
-        {
-          UpdateText();
-        }
-      }
-      else if( modifiers == ModifierKeys.Control )
-      {
-        if( !RemoveSelectedText() )
-        {
-          int position = SelectionStart;
-
-          RemoveTextToEnd( position );
-          UpdateText( position );
-        }
-        else
-        {
-          UpdateText();
-        }
-      }
-      else if( modifiers == ModifierKeys.Shift )
-      {
-        if( RemoveSelectedText() )
-        {
-          UpdateText();
-        }
-        else
-        {
-          handled = false;
-        }
-      }
-      else
-      {
-        handled = false;
-      }
-
-      return handled;
-    }
-
-    private bool HandleKeyDownBack()
-    {
-      ModifierKeys modifiers = Keyboard.Modifiers;
-      bool handled = true;
-
-      if( modifiers == ModifierKeys.None || modifiers == ModifierKeys.Shift )
-      {
-        if( !RemoveSelectedText() )
-        {
-          int position = SelectionStart;
-
-          if( position > 0 )
-          {
-            int newPosition = position - 1;
-
-            RemoveText( newPosition, 1 );
-            UpdateText( newPosition );
-          }
-        }
-        else
-        {
-          UpdateText();
-        }
-      }
-      else if( modifiers == ModifierKeys.Control )
-      {
-        if( !RemoveSelectedText() )
-        {
-          RemoveTextFromStart( SelectionStart );
-          UpdateText( 0 );
-        }
-        else
-        {
-          UpdateText();
-        }
-      }
-      else
-      {
-        handled = false;
-      }
-
-      return handled;
-    }
-
-    private void InsertText( string text )
-    {
-      int position = SelectionStart;
-      MaskedTextProvider provider = MaskProvider;
-
-      bool textRemoved = this.RemoveSelectedText();
-
-      position = GetNextCharacterPosition( position );
-
-      if( !textRemoved && Keyboard.IsKeyToggled( Key.Insert ) )
-      {
-        if( provider.Replace( text, position ) )
-        {
-          position += text.Length;
-        }
-      }
-      else
-      {
-        if( provider.InsertAt( text, position ) )
-        {
-          position += text.Length;
-        }
-      }
-
-      position = GetNextCharacterPosition( position );
-
-      this.UpdateText( position );
-    }
-
-    private void RemoveTextFromStart( int endPosition )
-    {
-      RemoveText( 0, endPosition );
-    }
-
-    private void RemoveTextToEnd( int startPosition )
-    {
-      RemoveText( startPosition, Text.Length - startPosition );
-    }
-
-    private void RemoveText( int position, int length )
-    {
-      if( length == 0 )
-        return;
-
-      MaskProvider.RemoveAt( position, position + length - 1 );
-    }
-
-    private bool RemoveSelectedText()
-    {
-      int length = SelectionLength;
-
-      if( length == 0 )
-        return false;
-
-      int position = SelectionStart;
-
-      return MaskProvider.RemoveAt( position, position + length - 1 );
-    }
-
-    #endregion //Private
-
-    #endregion //Methods
-
-    #region Commands
-
-    private void Paste( object sender, RoutedEventArgs e )
-    {
-      if( IsReadOnly )
-        return;
-
-      object data = Clipboard.GetData( DataFormats.Text );
-      if( data != null )
-      {
-        string text = data.ToString().Trim();
-        if( text.Length > 0 )
-        {
-          int position = SelectionStart;
-
-          MaskProvider.Set( text );
-
-          UpdateText( position );
-        }
-      }
-    }
-
-    private void CanCut( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = false;
-      e.Handled = true;
-    }
-
-    #endregion //Commands
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
deleted file mode 100644
index dcc130ef..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
+++ /dev/null
@@ -1,1875 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Reflection;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Media.Animation;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public abstract class AnimationPanel : PanelBase
-  {
-    #region Constructors
-
-    public AnimationPanel()
-    {
-#if DEBUG
-      Type derivedType = GetType();
-
-      FieldInfo[] fields = derivedType.GetFields( BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public );
-
-      foreach( FieldInfo field in fields )
-      {
-        if( field.FieldType == typeof( DependencyProperty ) )
-        {
-          DependencyProperty prop = ( DependencyProperty )field.GetValue( null );
-          PropertyMetadata metaData = prop.GetMetadata( this );
-
-          if( metaData is FrameworkPropertyMetadata )
-          {
-            FrameworkPropertyMetadata frameworkData = ( FrameworkPropertyMetadata )metaData;
-
-            if( frameworkData.AffectsArrange == true || frameworkData.AffectsMeasure == true ||
-                frameworkData.AffectsParentArrange == true || frameworkData.AffectsParentMeasure == true )
-            {
-              System.Console.WriteLine( "AnimationPanel: " + derivedType.Name + "." + field.Name +
-                  " - You should not set dependency property metadata flags that " +
-                  "affect measure or arrange, instead call AnimationPanel's InvalidateMeasure or " +
-                  "InvalidateArrange directly." );
-            }
-          }
-        }
-      }
-#endif
-
-      this.Loaded += new RoutedEventHandler( this.OnLoaded );
-    }
-
-    #endregion
-
-    #region ChildState Private Property
-
-    private static readonly DependencyPropertyKey ChildStatePropertyKey =
-      DependencyProperty.RegisterAttachedReadOnly( "ChildState", typeof( ChildState ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( null ) );
-
-    private static ChildState GetChildState( DependencyObject d )
-    {
-      return ( ChildState )d.GetValue( AnimationPanel.ChildStatePropertyKey.DependencyProperty );
-    }
-
-    private static void SetChildState( DependencyObject d, ChildState value )
-    {
-      d.SetValue( AnimationPanel.ChildStatePropertyKey, value );
-    }
-
-    #endregion
-
-    #region DefaultAnimationRate Property
-
-    public static readonly DependencyProperty DefaultAnimationRateProperty =
-      DependencyProperty.Register( "DefaultAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( ( AnimationRate )1d ),
-          new ValidateValueCallback( AnimationPanel.ValidateDefaultAnimationRate ) );
-
-    public AnimationRate DefaultAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.DefaultAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.DefaultAnimationRateProperty, value );
-      }
-    }
-
-    private static bool ValidateDefaultAnimationRate( object value )
-    {
-      if( ( AnimationRate )value == AnimationRate.Default )
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.DefaultAnimationRateAnimationRateDefault ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region DefaultAnimator Property
-
-    public static readonly DependencyProperty DefaultAnimatorProperty =
-      DependencyProperty.Register( "DefaultAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( Animators.Linear ),
-          new ValidateValueCallback( AnimationPanel.ValidateDefaultAnimator ) );
-
-    public IterativeAnimator DefaultAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.DefaultAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.DefaultAnimatorProperty, value );
-      }
-    }
-
-    private static bool ValidateDefaultAnimator( object value )
-    {
-      if( value == IterativeAnimator.Default )
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.DefaultAnimatorIterativeAnimationDefault ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region EnterAnimationRate Property
-
-    public static readonly DependencyProperty EnterAnimationRateProperty =
-      DependencyProperty.Register( "EnterAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate EnterAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.EnterAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.EnterAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EnterAnimator Property
-
-    public static readonly DependencyProperty EnterAnimatorProperty =
-      DependencyProperty.Register( "EnterAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator EnterAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.EnterAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.EnterAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EnterFrom Attached Property
-
-    public static readonly DependencyProperty EnterFromProperty =
-      DependencyProperty.RegisterAttached( "EnterFrom", typeof( Rect? ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( ( Rect? )null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static Rect? GetEnterFrom( DependencyObject d )
-    {
-      return ( Rect? )d.GetValue( AnimationPanel.EnterFromProperty );
-    }
-
-    public static void SetEnterFrom( DependencyObject d, Rect? value )
-    {
-      d.SetValue( AnimationPanel.EnterFromProperty, value );
-    }
-
-    #endregion
-
-    #region ExitAnimationRate Property
-
-    public static readonly DependencyProperty ExitAnimationRateProperty =
-      DependencyProperty.Register( "ExitAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate ExitAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.ExitAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.ExitAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ExitAnimator Property
-
-    public static readonly DependencyProperty ExitAnimatorProperty =
-      DependencyProperty.Register( "ExitAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator ExitAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.ExitAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.ExitAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ExitTo Attached Property
-
-    public static readonly DependencyProperty ExitToProperty =
-      DependencyProperty.RegisterAttached( "ExitTo", typeof( Rect? ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( ( Rect? )null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static Rect? GetExitTo( DependencyObject d )
-    {
-      return ( Rect? )d.GetValue( AnimationPanel.ExitToProperty );
-    }
-
-    public static void SetExitTo( DependencyObject d, Rect? value )
-    {
-      d.SetValue( AnimationPanel.ExitToProperty, value );
-    }
-
-    #endregion
-
-    #region LayoutAnimationRate Property
-
-    public static readonly DependencyProperty LayoutAnimationRateProperty =
-      DependencyProperty.Register( "LayoutAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate LayoutAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.LayoutAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.LayoutAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region LayoutAnimator Property
-
-    public static readonly DependencyProperty LayoutAnimatorProperty =
-      DependencyProperty.Register( "LayoutAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator LayoutAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.LayoutAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.LayoutAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchAnimationRate Property
-
-    public static readonly DependencyProperty SwitchAnimationRateProperty =
-      DependencyProperty.Register( "SwitchAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate SwitchAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.SwitchAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.SwitchAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchAnimator Property
-
-    public static readonly DependencyProperty SwitchAnimatorProperty =
-      DependencyProperty.Register( "SwitchAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator SwitchAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.SwitchAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.SwitchAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchParent Property
-
-    private static readonly DependencyPropertyKey SwitchParentPropertyKey =
-      DependencyProperty.RegisterReadOnly( "SwitchParent", typeof( SwitchPanel ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( null,
-          new PropertyChangedCallback( AnimationPanel.OnSwitchParentChanged ) ) );
-
-    public static readonly DependencyProperty SwitchParentProperty = AnimationPanel.SwitchParentPropertyKey.DependencyProperty;
-
-    public SwitchPanel SwitchParent
-    {
-      get
-      {
-        return ( SwitchPanel )this.GetValue( AnimationPanel.SwitchParentProperty );
-      }
-    }
-
-    protected internal void SetSwitchParent( SwitchPanel value )
-    {
-      this.SetValue( AnimationPanel.SwitchParentPropertyKey, value );
-    }
-
-    private static void OnSwitchParentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( AnimationPanel )d ).OnSwitchParentChanged( e );
-    }
-
-    protected virtual void OnSwitchParentChanged( DependencyPropertyChangedEventArgs e )
-    {
-      _switchParent = e.NewValue as SwitchPanel;
-    }
-
-    #endregion
-
-    #region SwitchTemplate Property
-
-    public static readonly DependencyProperty SwitchTemplateProperty =
-      DependencyProperty.Register( "SwitchTemplate", typeof( DataTemplate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( null,
-          new PropertyChangedCallback( AnimationPanel.OnSwitchTemplateChanged ) ) );
-
-    public DataTemplate SwitchTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( AnimationPanel.SwitchTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.SwitchTemplateProperty, value );
-      }
-    }
-
-    private static void OnSwitchTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( AnimationPanel )d ).OnSwitchTemplateChanged( e );
-    }
-
-    protected virtual void OnSwitchTemplateChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( _switchParent != null && _switchParent.ActiveLayout == this )
-      {
-        _switchParent.UpdateSwitchTemplate();
-      }
-    }
-
-    #endregion
-
-    #region TemplateAnimationRate Property
-
-    public static readonly DependencyProperty TemplateAnimationRateProperty =
-      DependencyProperty.Register( "TemplateAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate TemplateAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.TemplateAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.TemplateAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region TemplateAnimator Property
-
-    public static readonly DependencyProperty TemplateAnimatorProperty =
-      DependencyProperty.Register( "TemplateAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator TemplateAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.TemplateAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.TemplateAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DesiredSize Property
-
-    public new Size DesiredSize
-    {
-      get
-      {
-        return ( _switchParent != null ) ? _switchParent.DesiredSize : base.DesiredSize;
-      }
-    }
-
-    #endregion
-
-    #region RenderSize Property
-
-    public new Size RenderSize
-    {
-      get
-      {
-        return ( _switchParent != null ) ? _switchParent.RenderSize : base.RenderSize;
-      }
-      set
-      {
-        base.RenderSize = value;
-      }
-    }
-
-    #endregion
-
-    #region IsActiveLayout Property
-
-    public bool IsActiveLayout
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsActiveLayout ];
-      }
-      private set
-      {
-        _cacheBits[ ( int )CacheBits.IsActiveLayout ] = value;
-      }
-    }
-
-    #endregion
-
-    #region InternalChildren Protected Property
-
-    protected internal new UIElementCollection InternalChildren
-    {
-      get
-      {
-        return ( _switchParent == null ) ? base.InternalChildren : _switchParent.ChildrenInternal;
-      }
-    }
-
-    #endregion
-
-    #region VisualChildrenCount Protected Property
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return this.HasLoaded ? this.InternalChildren.Count + this.ExitingChildren.Count : base.VisualChildrenCount;
-      }
-    }
-
-    #endregion
-
-    #region ChildrensParent Protected Property
-
-    protected PanelBase ChildrensParent
-    {
-      get
-      {
-        return _switchParent != null ? ( PanelBase )_switchParent : this;
-      }
-    }
-
-    #endregion
-
-    #region VisualChildrenCountInternal Internal Property
-
-    internal int VisualChildrenCountInternal
-    {
-      get
-      {
-        return this.VisualChildrenCount;
-      }
-    }
-
-    #endregion
-
-    #region PhysicalScrollOffset Internal Property
-
-    internal Vector PhysicalScrollOffset
-    {
-      get
-      {
-        return _physicalScrollOffset;
-      }
-      set
-      {
-        _physicalScrollOffset = value;
-      }
-    }
-
-    private Vector _physicalScrollOffset = new Vector();
-
-    #endregion
-
-    #region HasLoaded Internal Property
-
-    internal bool IsRemovingInternalChild
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsRemovingInternalChild ];
-      }
-      private set
-      {
-        _cacheBits[ ( int )CacheBits.IsRemovingInternalChild ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AnimatingChildCount Private Property
-
-    private int AnimatingChildCount
-    {
-      get
-      {
-        return _animatingChildCount;
-      }
-      set
-      {
-        // start the animation pump if the value goes positive
-        if( _animatingChildCount == 0 && value > 0 )
-        {
-          CompositionTarget.Rendering += new EventHandler( OnRendering );
-          RaiseAnimationBegunEvent();
-        }
-
-        // stop the animation pump if the value goes to 0
-        if( _animatingChildCount != 0 && value == 0 )
-        {
-          if( EndSwitchOnAnimationCompleted && _switchParent != null )
-          {
-            EndSwitchOnAnimationCompleted = false;
-            _switchParent.EndLayoutSwitch();
-          }
-
-          CompositionTarget.Rendering -= new EventHandler( OnRendering );
-          RaiseAnimationCompletedEvent();
-        }
-
-        _animatingChildCount = value;
-      }
-    }
-
-    private int _animatingChildCount;
-
-    #endregion
-
-    #region EndSwitchOnAnimationCompleted Private Property
-
-    private bool EndSwitchOnAnimationCompleted
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.EndSwitchOnAnimationCompleted ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.EndSwitchOnAnimationCompleted ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasArranged Private Property
-
-    private bool HasArranged
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasArranged ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.HasArranged ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasLoaded Private Property
-
-    protected bool HasLoaded
-    {
-      get
-      {
-        return _switchParent == null ? _cacheBits[ ( int )CacheBits.HasLoaded ] : _switchParent.HasLoaded;
-      }
-      private set
-      {
-        _cacheBits[ ( int )CacheBits.HasLoaded ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsSwitchInProgress Private Property
-
-    private bool IsSwitchInProgress
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsSwitchInProgress ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsSwitchInProgress ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ItemsOwner Private Property
-
-    private ItemsControl ItemsOwner
-    {
-      get
-      {
-        return ItemsControl.GetItemsOwner( _switchParent == null ? ( Panel )this : ( Panel )_switchParent );
-      }
-    }
-
-    #endregion
-
-    #region ExitingChildren Private Property
-
-    private List<UIElement> ExitingChildren
-    {
-      get
-      {
-        if( _switchParent != null )
-          return _switchParent.ExitingChildren;
-
-        if( _exitingChildren == null )
-        {
-          _exitingChildren = new List<UIElement>();
-        }
-
-        return _exitingChildren;
-      }
-    }
-
-    #endregion
-
-    #region AnimationBegun Event
-
-    public static readonly RoutedEvent AnimationBegunEvent =
-      EventManager.RegisterRoutedEvent( "AnimationBegun", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( AnimationPanel ) );
-
-    public event RoutedEventHandler AnimationBegun
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.AnimationBegunEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.AnimationBegunEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseAnimationBegunEvent()
-    {
-      return AnimationPanel.RaiseAnimationBegunEvent( ( this._switchParent != null ) ? ( UIElement )this._switchParent : ( UIElement )this );
-    }
-
-    private static RoutedEventArgs RaiseAnimationBegunEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = AnimationPanel.AnimationBegunEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region AnimationCompleted Event
-
-    public static readonly RoutedEvent AnimationCompletedEvent =
-      EventManager.RegisterRoutedEvent( "AnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( AnimationPanel ) );
-
-    public event RoutedEventHandler AnimationCompleted
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.AnimationCompletedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.AnimationCompletedEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseAnimationCompletedEvent()
-    {
-      return AnimationPanel.RaiseAnimationCompletedEvent( ( this._switchParent != null ) ? ( UIElement )this._switchParent : ( UIElement )this );
-    }
-
-    private static RoutedEventArgs RaiseAnimationCompletedEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = AnimationPanel.AnimationCompletedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region ChildEntered Event
-
-    public static readonly RoutedEvent ChildEnteredEvent =
-      EventManager.RegisterRoutedEvent( "ChildEntered", RoutingStrategy.Bubble, typeof( ChildEnteredEventHandler ), typeof( AnimationPanel ) );
-
-    public event ChildEnteredEventHandler ChildEntered
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.ChildEnteredEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.ChildEnteredEvent, value );
-      }
-    }
-
-    protected ChildEnteredEventArgs RaiseChildEnteredEvent( UIElement child, Rect arrangeRect )
-    {
-      return AnimationPanel.RaiseChildEnteredEvent( this, child, arrangeRect );
-    }
-
-    internal static ChildEnteredEventArgs RaiseChildEnteredEvent( UIElement target, UIElement child, Rect arrangeRect )
-    {
-      if( target == null )
-        return null;
-
-      ChildEnteredEventArgs args = new ChildEnteredEventArgs( child, arrangeRect );
-      args.RoutedEvent = AnimationPanel.ChildEnteredEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region ChildEntering Event
-
-    public static readonly RoutedEvent ChildEnteringEvent =
-      EventManager.RegisterRoutedEvent( "ChildEntering", RoutingStrategy.Bubble, typeof( ChildEnteringEventHandler ), typeof( AnimationPanel ) );
-
-    public event ChildEnteringEventHandler ChildEntering
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.ChildEnteringEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.ChildEnteringEvent, value );
-      }
-    }
-
-    protected ChildEnteringEventArgs RaiseChildEnteringEvent( UIElement child, Rect? EnterFrom, Rect ArrangeRect )
-    {
-      return AnimationPanel.RaiseChildEnteringEvent( this, child, EnterFrom, ArrangeRect );
-    }
-
-    private static ChildEnteringEventArgs RaiseChildEnteringEvent( UIElement target, UIElement child, Rect? EnterFrom, Rect ArrangeRect )
-    {
-      if( target == null )
-        return null;
-
-      ChildEnteringEventArgs args = new ChildEnteringEventArgs( child, EnterFrom, ArrangeRect );
-      args.RoutedEvent = AnimationPanel.ChildEnteringEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region ChildExited Event
-
-    public static readonly RoutedEvent ChildExitedEvent =
-      EventManager.RegisterRoutedEvent( "ChildExited", RoutingStrategy.Bubble, typeof( ChildExitedEventHandler ), typeof( AnimationPanel ) );
-
-    public event ChildExitedEventHandler ChildExited
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.ChildExitedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.ChildExitedEvent, value );
-      }
-    }
-
-    protected ChildExitedEventArgs RaiseChildExitedEvent( UIElement child )
-    {
-      return AnimationPanel.RaiseChildExitedEvent( this, child );
-    }
-
-    private static ChildExitedEventArgs RaiseChildExitedEvent( UIElement target, UIElement child )
-    {
-      if( target == null )
-        return null;
-
-      ChildExitedEventArgs args = new ChildExitedEventArgs( child );
-      args.RoutedEvent = AnimationPanel.ChildExitedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region ChildExiting Event
-
-    public static readonly RoutedEvent ChildExitingEvent =
-      EventManager.RegisterRoutedEvent( "ChildExiting", RoutingStrategy.Bubble, typeof( ChildExitingEventHandler ), typeof( AnimationPanel ) );
-
-    public event ChildExitingEventHandler ChildExiting
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.ChildExitingEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.ChildExitingEvent, value );
-      }
-    }
-
-    protected ChildExitingEventArgs RaiseChildExitingEvent( UIElement child, Rect? exitTo, Rect arrangeRect )
-    {
-      return AnimationPanel.RaiseChildExitingEvent( this, child, exitTo, arrangeRect );
-    }
-
-    private static ChildExitingEventArgs RaiseChildExitingEvent( UIElement target, UIElement child, Rect? exitTo, Rect arrangeRect )
-    {
-      if( target == null )
-        return null;
-
-      ChildExitingEventArgs args = new ChildExitingEventArgs( child, exitTo, arrangeRect );
-      args.RoutedEvent = AnimationPanel.ChildExitingEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region SwitchLayoutActivated Event
-
-    public static readonly RoutedEvent SwitchLayoutActivatedEvent =
-      EventManager.RegisterRoutedEvent( "SwitchLayoutActivated", RoutingStrategy.Direct, typeof( RoutedEventHandler ), typeof( AnimationPanel ) );
-
-    public event RoutedEventHandler SwitchLayoutActivated
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.SwitchLayoutActivatedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.SwitchLayoutActivatedEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseSwitchLayoutActivatedEvent()
-    {
-      return AnimationPanel.RaiseSwitchLayoutActivatedEvent( this );
-    }
-
-    internal static RoutedEventArgs RaiseSwitchLayoutActivatedEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = AnimationPanel.SwitchLayoutActivatedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region SwitchLayoutDeactivated Event
-
-    public static readonly RoutedEvent SwitchLayoutDeactivatedEvent =
-      EventManager.RegisterRoutedEvent( "SwitchLayoutDeactivated", RoutingStrategy.Direct, typeof( RoutedEventHandler ), typeof( AnimationPanel ) );
-
-    public event RoutedEventHandler SwitchLayoutDeactivated
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.SwitchLayoutDeactivatedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.SwitchLayoutDeactivatedEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseSwitchLayoutDeactivatedEvent()
-    {
-      return AnimationPanel.RaiseSwitchLayoutDeactivatedEvent( this );
-    }
-
-    internal static RoutedEventArgs RaiseSwitchLayoutDeactivatedEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = AnimationPanel.SwitchLayoutDeactivatedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    public new void InvalidateArrange()
-    {
-      if( _switchParent == null )
-      {
-        base.InvalidateArrange();
-      }
-      else
-      {
-        _switchParent.InvalidateArrange();
-      }
-    }
-
-    public new void InvalidateMeasure()
-    {
-      if( _switchParent == null )
-      {
-        base.InvalidateMeasure();
-      }
-      else
-      {
-        _switchParent.InvalidateMeasure();
-      }
-    }
-
-    public new void InvalidateVisual()
-    {
-      if( _switchParent == null )
-      {
-        base.InvalidateVisual();
-      }
-      else
-      {
-        _switchParent.InvalidateVisual();
-      }
-    }
-
-    internal void ActivateLayout()
-    {
-      this.HasArranged = false;
-      this.IsActiveLayout = true;
-      this.OnSwitchLayoutActivated();
-      this.RaiseSwitchLayoutActivatedEvent();
-    }
-
-    internal void BeginChildExit( UIElement child )
-    {
-      ChildState state = AnimationPanel.GetChildState( child );
-      if( state != null )
-      {
-        state.Type = AnimationType.Exit;
-        state.HasExitBegun = true;
-
-        this.ExitingChildren.Add( child );
-
-        if( _switchParent != null )
-        {
-          _switchParent.AddVisualChildInternal( child );
-        }
-        else
-        {
-          this.AddVisualChild( child );
-        }
-
-        // raise the ChildExiting event only after the child has been re-added to the visual tree
-        ChildExitingEventArgs ceea = AnimationPanel.RaiseChildExitingEvent( child, child, AnimationPanel.GetExitTo( child ), state.CurrentPlacement );
-
-        // begin the exit animation, if necessary
-        state.Animator = this.GetEffectiveAnimator( AnimationType.Exit );
-        if( state.Animator != null )
-        {
-          state.TargetPlacement = ceea.ExitTo.HasValue ? ceea.ExitTo.Value : Rect.Empty;
-          state.BeginTimeStamp = DateTime.Now;
-
-          // decrement the animating count if this child is already animating because the 
-          // ArrangeChild call will increment it again
-          if( state.IsAnimating )
-          {
-            this.AnimatingChildCount--;
-          }
-          this.ArrangeChild( child, state.TargetPlacement );
-        }
-        else
-        {
-          // no animation, so immediately end the exit routine
-          this.EndChildExit( child, state );
-        }
-      }
-    }
-
-    internal void BeginGrandchildAnimation( FrameworkElement grandchild, Rect currentRect, Rect placementRect )
-    {
-      bool isDone = true;
-      object placementArgs;
-      ChildState state = new ChildState( currentRect );
-      AnimationPanel.SetChildState( grandchild, state );
-      state.Type = AnimationType.Switch;
-      state.BeginTimeStamp = DateTime.Now;
-      state.TargetPlacement = placementRect;
-      state.Animator = this.GetEffectiveAnimator( AnimationType.Template );
-      if( state.Animator != null && !state.TargetPlacement.IsEmpty )
-      {
-        AnimationRate rate = this.GetEffectiveAnimationRate( AnimationType.Template );
-        state.CurrentPlacement = state.Animator.GetInitialChildPlacement( grandchild, state.CurrentPlacement, state.TargetPlacement, this, ref rate, out placementArgs, out isDone );
-        state.AnimationRate = rate;
-        state.PlacementArgs = placementArgs;
-      }
-      state.IsAnimating = !isDone;
-      grandchild.Arrange( state.IsAnimating ? state.CurrentPlacement : state.TargetPlacement );
-      if( state.IsAnimating )
-      {
-        _animatingGrandchildren.Add( grandchild );
-        this.AnimatingChildCount++;
-      }
-      else
-      {
-        state.CurrentPlacement = state.TargetPlacement;
-      }
-    }
-
-    internal void DeactivateLayout()
-    {
-      this.IsActiveLayout = false;
-      this.AnimatingChildCount = 0;
-      this.OnSwitchLayoutDeactivated();
-      this.RaiseSwitchLayoutDeactivatedEvent();
-    }
-
-    internal static UIElement FindAncestorChildOfAnimationPanel( DependencyObject element, out AnimationPanel panel )
-    {
-      panel = null;
-      if( element == null )
-        return null;
-
-      DependencyObject parent = VisualTreeHelper.GetParent( element );
-      if( parent == null )
-        return null;
-
-      if( parent is AnimationPanel || parent is SwitchPanel )
-      {
-        panel = ( parent is SwitchPanel )
-            ? ( parent as SwitchPanel )._currentLayoutPanel
-            : parent as AnimationPanel;
-        return element as UIElement;
-      }
-
-      return AnimationPanel.FindAncestorChildOfAnimationPanel( parent, out panel );
-    }
-
-    internal Dictionary<string, Rect> GetNewLocationsBasedOnTargetPlacement( SwitchPresenter presenter, UIElement parent )
-    {
-      ChildState state = AnimationPanel.GetChildState( parent );
-
-      // if necessary, temporarily arrange the element at its final placement
-      bool rearrange = ( state.CurrentPlacement != state.TargetPlacement && state.IsAnimating );
-      if( rearrange )
-      {
-        parent.Arrange( state.TargetPlacement );
-      }
-
-      // now create a dictionary of locations for ID'd elements
-      Dictionary<string, Rect> result = new Dictionary<string, Rect>();
-      foreach( KeyValuePair<string, FrameworkElement> entry in presenter._knownIDs )
-      {
-        Size size = entry.Value.RenderSize;
-        Point[] points = { new Point(), new Point( size.Width, size.Height ) };
-        ( entry.Value.TransformToAncestor( VisualTreeHelper.GetParent( entry.Value ) as Visual ) as MatrixTransform ).Matrix.Transform( points );
-        result[ entry.Key ] = new Rect( points[ 0 ], points[ 1 ] );
-      }
-
-      // restore the current placement
-      if( rearrange )
-      {
-        parent.Arrange( state.CurrentPlacement );
-      }
-      return result;
-    }
-
-    internal Visual GetVisualChildInternal( int index )
-    {
-      return this.GetVisualChild( index );
-    }
-
-    internal void OnNotifyVisualChildAddedInternal( UIElement child )
-    {
-      this.OnNotifyVisualChildAdded( child );
-    }
-
-    internal void OnNotifyVisualChildRemovedInternal( UIElement child )
-    {
-      this.OnNotifyVisualChildRemoved( child );
-    }
-
-    internal Size MeasureChildrenCore( UIElementCollection children, Size constraint )
-    {
-      _currentChildren = children;
-      return MeasureChildrenOverride( _currentChildren, constraint );
-    }
-
-    internal Size ArrangeChildrenCore( UIElementCollection children, Size finalSize )
-    {
-      if( _currentChildren != children )
-      {
-        _currentChildren = children;
-      }
-
-      // always reset the animating children count at the beginning of an arrange
-      this.AnimatingChildCount = 0;
-      _animatingGrandchildren.Clear();
-
-      Size result;
-      try
-      {
-        // determine if this arrange represents a layout switch for a SwitchPanel
-        if( !this.HasArranged && _switchParent != null )
-        {
-          this.IsSwitchInProgress = true;
-          _switchParent.BeginLayoutSwitch();
-        }
-
-        // arrange active children
-        result = this.ArrangeChildrenOverride( _currentChildren, finalSize );
-
-        // also arrange exiting children, if necessary
-        if( this.ExitingChildren.Count > 0 )
-        {
-          this.AnimatingChildCount += this.ExitingChildren.Count;
-          this.UpdateExitingChildren();
-        }
-
-        // if this is a layout switch, make sure the switch is ended
-        if( this.IsSwitchInProgress )
-        {
-          if( this.AnimatingChildCount == 0 )
-          {
-            _switchParent.EndLayoutSwitch();
-          }
-          else
-          {
-            this.EndSwitchOnAnimationCompleted = true;
-          }
-        }
-      }
-      finally
-      {
-        this.HasArranged = true;
-        this.IsSwitchInProgress = false;
-      }
-      return result;
-    }
-
-    internal void OnSwitchParentVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      this.OnVisualChildrenChanged( visualAdded, visualRemoved );
-    }
-
-    protected sealed override Size MeasureOverride( Size constraint )
-    {
-      return this.MeasureChildrenCore( InternalChildren, constraint );
-    }
-
-    protected abstract Size MeasureChildrenOverride( UIElementCollection children, Size constraint );
-
-    protected sealed override Size ArrangeOverride( Size finalSize )
-    {
-      return this.ArrangeChildrenCore( _currentChildren, finalSize );
-    }
-
-    protected abstract Size ArrangeChildrenOverride( UIElementCollection children, Size finalSize );
-
-    protected void ArrangeChild( UIElement child, Rect placementRect )
-    {
-      // Offset in case SwitchPanel is handling scroll.
-      if( placementRect.IsEmpty == false && this.PhysicalScrollOffset.Length > 0 )
-      {
-        placementRect.Offset( -this.PhysicalScrollOffset );
-      }
-
-      // cannot start animations unless the panel is loaded
-      if( this.HasLoaded )
-      {
-        if( this.BeginChildAnimation( child, placementRect ) )
-        {
-          this.AnimatingChildCount++;
-        }
-      }
-      else
-      {
-        // just arrange the child if the panel has not yet loaded
-        child.Arrange( placementRect );
-      }
-    }
-
-    protected new void AddVisualChild( Visual child )
-    {
-      if( _switchParent == null )
-      {
-        base.AddVisualChild( child );
-      }
-      else
-      {
-        _switchParent.AddVisualChildInternal( child );
-      }
-    }
-
-    protected override Visual GetVisualChild( int index )
-    {
-      if( index < 0 )
-      {
-        throw new IndexOutOfRangeException();
-      }
-      if( index >= this.InternalChildren.Count )
-      {
-        int exitIndex = index - this.InternalChildren.Count;
-        if( exitIndex < 0 || exitIndex >= this.ExitingChildren.Count )
-          throw new IndexOutOfRangeException();
-
-        return this.ExitingChildren[ exitIndex ];
-      }
-      return ( _switchParent == null ) ? base.GetVisualChild( index ) : _switchParent.GetVisualChildInternal( index );
-    }
-
-    protected virtual void OnNotifyVisualChildAdded( UIElement child )
-    {
-    }
-
-    protected virtual void OnNotifyVisualChildRemoved( UIElement child )
-    {
-    }
-
-    protected virtual void OnSwitchLayoutActivated()
-    {
-    }
-
-    protected virtual void OnSwitchLayoutDeactivated()
-    {
-    }
-
-    protected override void OnVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      if( !this.IsRemovingInternalChild )
-      {
-        if( visualRemoved is UIElement && visualRemoved != null )
-        {
-          this.IsRemovingInternalChild = true;
-          try
-          {
-            this.BeginChildExit( visualRemoved as UIElement );
-          }
-          finally
-          {
-            this.IsRemovingInternalChild = false;
-          }
-        }
-      }
-      if( _switchParent == null )
-      {
-        // The OnNotifyChildAdded/Removed methods get called for all animation panels within a 
-        // SwitchPanel.Layouts collection, regardless of whether they are the active layout 
-        // for the SwitchPanel.  Here, we also ensure that the methods are called for standalone panels.
-        if( visualAdded is UIElement )
-        {
-          this.OnNotifyVisualChildAdded( visualAdded as UIElement );
-        }
-        else if( visualRemoved is UIElement )
-        {
-          this.OnNotifyVisualChildRemoved( visualRemoved as UIElement );
-        }
-        base.OnVisualChildrenChanged( visualAdded, visualRemoved );
-      }
-      else
-      {
-        _switchParent.OnVisualChildrenChangedInternal( visualAdded, visualRemoved );
-      }
-    }
-
-
-    protected new void RemoveVisualChild( Visual child )
-    {
-      if( _switchParent == null )
-      {
-        base.RemoveVisualChild( child );
-      }
-      else
-      {
-        _switchParent.RemoveVisualChildInternal( child );
-      }
-    }
-
-    protected int FindChildFromVisual( Visual vis )
-    {
-      int index = -1;
-
-      DependencyObject parent = vis;
-      DependencyObject child = null;
-
-      do
-      {
-        child = parent;
-        parent = VisualTreeHelper.GetParent( child );
-      }
-      while( parent != null && parent != ChildrensParent );
-
-      if( parent == this.ChildrensParent )
-      {
-        index = this.ChildrensParent.Children.IndexOf( ( UIElement )child );
-      }
-
-      return index;
-    }
-
-    private bool BeginChildAnimation( UIElement child, Rect placementRect )
-    {
-      // a private attached property is used to hold the information needed 
-      // to calculate the location of items on subsequent frame refreshes
-      bool newStateCreated;
-      ChildState state = this.EnsureChildState( child, placementRect, out newStateCreated );
-      if( state.HasEnterCompleted )
-      {
-        if( state.Type != AnimationType.Exit )
-        {
-          state.BeginTimeStamp = DateTime.Now;
-          state.Type = IsSwitchInProgress ? AnimationType.Switch : AnimationType.Layout;
-          state.TargetPlacement = placementRect;
-        }
-      }
-      else
-      {
-        // if the child is in the middle of an enter animation, we
-        // still need to update the placement rect
-        state.BeginTimeStamp = DateTime.Now;
-        state.TargetPlacement = placementRect;
-      }
-
-      if( !state.HasExitCompleted )
-      {
-        bool isDone = true;
-        object placementArgs;
-        if( state.Type != AnimationType.Enter )
-        {
-          state.Animator = this.GetEffectiveAnimator( state.Type );
-        }
-        if( state.Animator != null && !state.TargetPlacement.IsEmpty )
-        {
-          AnimationRate rate = this.GetEffectiveAnimationRate( state.Type );
-          state.CurrentPlacement = state.Animator.GetInitialChildPlacement(
-              child, state.CurrentPlacement, state.TargetPlacement, this,
-              ref rate, out placementArgs, out isDone );
-          state.AnimationRate = rate;
-          state.PlacementArgs = placementArgs;
-        }
-        state.IsAnimating = !isDone;
-        if( !state.IsAnimating )
-        {
-          state.CurrentPlacement = state.TargetPlacement;
-        }
-      }
-
-      // JZ this might not be needed nice the OnRender will arrange
-      if( state.IsAnimating == false )
-      {
-        this.UpdateTrueArrange( child, state );
-      }
-
-      return state.IsAnimating;
-    }
-
-    private void BeginChildEnter( UIElement child, ChildState state )
-    {
-      state.Type = AnimationType.Enter;
-
-      // raise the ChildEntering event
-      ChildEnteringEventArgs ceea = AnimationPanel.RaiseChildEnteringEvent( child,
-          child, GetEnterFrom( child ), state.CurrentPlacement );
-
-      // begin the enter animation, if necessary
-      state.Animator = this.GetEffectiveAnimator( AnimationType.Enter );
-      if( state.Animator != null && ceea.EnterFrom.HasValue )
-      {
-        state.CurrentPlacement = ceea.EnterFrom.Value;
-        state.BeginTimeStamp = DateTime.Now;
-      }
-    }
-
-    private void EndChildEnter( UIElement child, ChildState state )
-    {
-      // raise the ChildExited event
-      state.HasEnterCompleted = true;
-      AnimationPanel.RaiseChildEnteredEvent( child, child, state.TargetPlacement );
-    }
-
-    private void EndChildExit( UIElement child, ChildState state )
-    {
-      // raise the ChildExited event
-      state.HasExitCompleted = true;
-      AnimationPanel.RaiseChildExitedEvent( child, child );
-
-      // remove the visual child relationship
-      if( this.ExitingChildren.Contains( child ) )
-      {
-        this.IsRemovingInternalChild = true;
-        try
-        {
-          if( _switchParent != null )
-          {
-            _switchParent.RemoveVisualChildInternal( child );
-          }
-          else
-          {
-            this.RemoveVisualChild( child );
-          }
-        }
-        finally
-        {
-          this.IsRemovingInternalChild = false;
-        }
-        this.ExitingChildren.Remove( child );
-      }
-
-      child.ClearValue( AnimationPanel.ChildStatePropertyKey );
-    }
-
-    private ChildState EnsureChildState( UIElement child, Rect placementRect, out bool newStateCreated )
-    {
-      newStateCreated = false;
-      ChildState state = AnimationPanel.GetChildState( child );
-      if( state == null )
-      {
-        // if this is null, it's because this is the first time that
-        // the object has been arranged
-        state = new ChildState( placementRect );
-        AnimationPanel.SetChildState( child, state );
-        this.BeginChildEnter( child, state );
-        newStateCreated = true;
-      }
-      return state;
-    }
-
-    internal AnimationRate GetEffectiveAnimationRate( AnimationType animationType )
-    {
-      AnimationRate result = ( _switchParent == null ) ? this.DefaultAnimationRate : _switchParent.DefaultAnimationRate;
-      switch( animationType )
-      {
-        case AnimationType.Enter:
-          if( this.EnterAnimationRate != AnimationRate.Default )
-          {
-            result = this.EnterAnimationRate;
-          }
-          else if( _switchParent != null && _switchParent.EnterAnimationRate != AnimationRate.Default )
-          {
-            result = _switchParent.EnterAnimationRate;
-          }
-          break;
-
-        case AnimationType.Exit:
-          if( this.ExitAnimationRate != AnimationRate.Default )
-          {
-            result = this.ExitAnimationRate;
-          }
-          else if( _switchParent != null && _switchParent.ExitAnimationRate != AnimationRate.Default )
-          {
-            result = _switchParent.ExitAnimationRate;
-          }
-          break;
-
-        case AnimationType.Layout:
-          if( this.LayoutAnimationRate != AnimationRate.Default )
-          {
-            result = LayoutAnimationRate;
-          }
-          else if( _switchParent != null && _switchParent.LayoutAnimationRate != AnimationRate.Default )
-          {
-            result = _switchParent.LayoutAnimationRate;
-          }
-          break;
-
-        case AnimationType.Switch:
-          if( this.SwitchAnimationRate != AnimationRate.Default )
-          {
-            result = SwitchAnimationRate;
-          }
-          else if( _switchParent != null && _switchParent.SwitchAnimationRate != AnimationRate.Default )
-          {
-            result = _switchParent.SwitchAnimationRate;
-          }
-          break;
-
-        case AnimationType.Template:
-          if( this.TemplateAnimationRate != AnimationRate.Default )
-          {
-            result = this.TemplateAnimationRate;
-          }
-          else if( _switchParent != null && _switchParent.TemplateAnimationRate != AnimationRate.Default )
-          {
-            result = _switchParent.TemplateAnimationRate;
-          }
-          break;
-      }
-      return result;
-    }
-
-    private IterativeAnimator GetEffectiveAnimator( AnimationType animationType )
-    {
-      IterativeAnimator result = ( _switchParent == null ) ? this.DefaultAnimator : _switchParent.DefaultAnimator;
-      switch( animationType )
-      {
-        case AnimationType.Enter:
-          if( this.EnterAnimator != IterativeAnimator.Default || ( _switchParent != null && _switchParent.EnterAnimator != IterativeAnimator.Default ) )
-          {
-            result = ( EnterAnimator == IterativeAnimator.Default ) ? _switchParent.EnterAnimator : EnterAnimator;
-          }
-          break;
-
-        case AnimationType.Exit:
-          if( this.ExitAnimator != IterativeAnimator.Default || ( _switchParent != null && _switchParent.ExitAnimator != IterativeAnimator.Default ) )
-          {
-            result = ( ExitAnimator == IterativeAnimator.Default ) ? _switchParent.ExitAnimator : ExitAnimator;
-          }
-          break;
-
-        case AnimationType.Layout:
-          if( this.LayoutAnimator != IterativeAnimator.Default || ( _switchParent != null && _switchParent.LayoutAnimator != IterativeAnimator.Default ) )
-          {
-            result = ( LayoutAnimator == IterativeAnimator.Default ) ? _switchParent.LayoutAnimator : LayoutAnimator;
-          }
-          break;
-
-        case AnimationType.Switch:
-          if( _switchParent != null && !_switchParent.AreLayoutSwitchesAnimated )
-          {
-            result = null;
-          }
-          else
-          {
-            if( this.SwitchAnimator != IterativeAnimator.Default || _switchParent.SwitchAnimator != IterativeAnimator.Default )
-            {
-              result = ( SwitchAnimator == IterativeAnimator.Default ) ? _switchParent.SwitchAnimator : SwitchAnimator;
-            }
-          }
-          break;
-
-        case AnimationType.Template:
-          if( this.TemplateAnimator != IterativeAnimator.Default || ( _switchParent != null && _switchParent.TemplateAnimator != IterativeAnimator.Default ) )
-          {
-            result = ( TemplateAnimator == IterativeAnimator.Default ) ? _switchParent.TemplateAnimator : TemplateAnimator;
-          }
-          break;
-      }
-      return result;
-    }
-
-    private void OnLoaded( object sender, RoutedEventArgs e )
-    {
-      this.HasLoaded = true;
-
-      // invalidate arrange to give enter animations a chance to run
-      this.InvalidateArrange();
-    }
-
-    private void OnRendering( object sender, EventArgs e )
-    {
-      if( !this.IsActiveLayout )
-        return;
-
-      if( _currentChildren != null )
-      {
-        foreach( UIElement child in _currentChildren )
-        {
-          if( child == null )
-            continue;
-
-          ChildState state = AnimationPanel.GetChildState( child );
-          if( state != null )
-          {
-            TimeSpan t = DateTime.Now.Subtract( state.BeginTimeStamp );
-            if( state.IsAnimating )
-            {
-              bool isDone;
-              state.CurrentPlacement = state.Animator.GetNextChildPlacement( child, t, state.CurrentPlacement,
-                  state.TargetPlacement, this, state.AnimationRate, ref state.PlacementArgs, out isDone );
-              state.IsAnimating = !isDone;
-              this.UpdateTrueArrange( child, state );
-              if( !state.IsAnimating )
-              {
-                this.AnimatingChildCount--;
-              }
-            }
-          }
-        }
-      }
-
-      foreach( FrameworkElement grandchild in _animatingGrandchildren )
-      {
-        ChildState state = AnimationPanel.GetChildState( grandchild );
-        if( state != null && state.IsAnimating )
-        {
-          TimeSpan t = DateTime.Now.Subtract( state.BeginTimeStamp );
-          bool isDone;
-          state.CurrentPlacement = state.Animator.GetNextChildPlacement( grandchild, t, state.CurrentPlacement,
-              state.TargetPlacement, this, state.AnimationRate, ref state.PlacementArgs, out isDone );
-          state.IsAnimating = !isDone;
-          Rect rect = state.IsAnimating ? state.CurrentPlacement : state.TargetPlacement;
-          grandchild.Arrange( rect );
-          if( !state.IsAnimating )
-          {
-            this.AnimatingChildCount--;
-          }
-        }
-      }
-
-      this.UpdateExitingChildren();
-
-      if( this.AnimatingChildCount == 0 )
-      {
-        _animatingGrandchildren.Clear();
-      }
-    }
-
-    private void UpdateExitingChildren()
-    {
-      if( this.ExitingChildren.Count > 0 )
-      {
-        List<UIElement> exitingChildren = new List<UIElement>( ExitingChildren );
-        foreach( UIElement child in exitingChildren )
-        {
-          if( child == null )
-            continue;
-
-          ChildState state = AnimationPanel.GetChildState( child );
-          if( state != null )
-          {
-            TimeSpan t = DateTime.Now.Subtract( state.BeginTimeStamp );
-            if( state.IsAnimating )
-            {
-              bool isDone;
-              state.CurrentPlacement = state.Animator.GetNextChildPlacement( child, t, state.CurrentPlacement,
-                  state.TargetPlacement, this, state.AnimationRate, ref state.PlacementArgs, out isDone );
-              state.IsAnimating = !isDone;
-              this.UpdateTrueArrange( child, state );
-              if( !state.IsAnimating )
-              {
-                this.AnimatingChildCount--;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    private void UpdateTrueArrange( UIElement child, ChildState state )
-    {
-      if( !state.TargetPlacement.IsEmpty )
-      {
-        child.Arrange( state.IsAnimating && state.Animator != null ? state.CurrentPlacement : state.TargetPlacement );
-      }
-
-      // if the child is done entering, complete the enter routine
-      if( !state.IsAnimating && !state.HasEnterCompleted )
-      {
-        this.EndChildEnter( child, state );
-      }
-
-      // if the child is done exiting, complete the exit routine
-      if( !state.IsAnimating && state.HasExitBegun )
-      {
-        this.EndChildExit( child, state );
-      }
-    }
-
-    #region Private Fields
-
-    private UIElementCollection _currentChildren;
-    private readonly Collection<FrameworkElement> _animatingGrandchildren = new Collection<FrameworkElement>();
-    private SwitchPanel _switchParent = null;
-    private List<UIElement> _exitingChildren = null;
-    private BitVector32 _cacheBits = new BitVector32( 1 );
-
-    #endregion
-
-    #region ChildState Nested Type
-
-    private sealed class ChildState
-    {
-      public ChildState( Rect currentRect )
-      {
-        this.CurrentPlacement = currentRect;
-        this.TargetPlacement = currentRect;
-        this.BeginTimeStamp = DateTime.Now;
-      }
-
-      public bool HasEnterCompleted
-      {
-        get
-        {
-          return _cacheBits[ ( int )CacheBits.HasEnterCompleted ];
-        }
-        set
-        {
-          _cacheBits[ ( int )CacheBits.HasEnterCompleted ] = value;
-        }
-      }
-
-      public bool HasExitBegun
-      {
-        get
-        {
-          return _cacheBits[ ( int )CacheBits.HasExitBegun ];
-        }
-        set
-        {
-          _cacheBits[ ( int )CacheBits.HasExitBegun ] = value;
-        }
-      }
-
-      public bool HasExitCompleted
-      {
-        get
-        {
-          return _cacheBits[ ( int )CacheBits.HasExitCompleted ];
-        }
-        set
-        {
-          _cacheBits[ ( int )CacheBits.HasExitCompleted ] = value;
-        }
-      }
-
-      public bool IsAnimating
-      {
-        get
-        {
-          return _cacheBits[ ( int )CacheBits.IsAnimating ];
-        }
-        set
-        {
-          _cacheBits[ ( int )CacheBits.IsAnimating ] = value;
-        }
-      }
-
-      public AnimationType Type;
-      public DateTime BeginTimeStamp;
-      public IterativeAnimator Animator;
-      public Rect CurrentPlacement;
-      public Rect TargetPlacement;
-      public AnimationRate AnimationRate;
-      public object PlacementArgs;
-
-      private BitVector32 _cacheBits = new BitVector32( 0 );
-      private enum CacheBits
-      {
-        IsAnimating = 0x00000001,
-        HasEnterCompleted = 0x00000002,
-        HasExitBegun = 0x00000004,
-        HasExitCompleted = 0x00000008,
-      }
-    }
-
-    #endregion
-
-    #region AnimationType Nested Type
-
-    internal enum AnimationType
-    {
-      Enter,
-      Exit,
-      Layout,
-      Switch,
-      Template,
-    }
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      IsActiveLayout = 0x00000001,
-      IsSwitchInProgress = 0x00000002,
-      EndSwitchOnAnimationCompleted = 0x00000010,
-      IsRemovingInternalChild = 0x00000020,
-      HasLoaded = 0x00000040,
-      HasArranged = 0x00000080,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
deleted file mode 100644
index 538628fe..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using Xceed.Wpf.Toolkit.Panels;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public sealed class AnimatorConverter : TypeConverter
-  {
-    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( string ) );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( IterativeAnimator ) )
-          || ( type == typeof( DoubleAnimator ) );
-    }
-
-    public override object ConvertFrom( 
-      ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value )
-    {
-      IterativeAnimator result = null;
-      if( value is string )
-      {
-        switch( value as string )
-        {
-          case "BackEaseIn":
-            result = Animators.BackEaseIn as IterativeAnimator;
-            break;
-          case "BackEaseInOut":
-            result = Animators.BackEaseInOut as IterativeAnimator;
-            break;
-          case "BackEaseOut":
-            result = Animators.BackEaseOut as IterativeAnimator;
-            break;
-          case "BounceEaseIn":
-            result = Animators.BounceEaseIn as IterativeAnimator;
-            break;
-          case "BounceEaseInOut":
-            result = Animators.BounceEaseInOut as IterativeAnimator;
-            break;
-          case "BounceEaseOut":
-            result = Animators.BounceEaseOut as IterativeAnimator;
-            break;
-          case "CircEaseIn":
-            result = Animators.CircEaseIn as IterativeAnimator;
-            break;
-          case "CircEaseInOut":
-            result = Animators.CircEaseInOut as IterativeAnimator;
-            break;
-          case "CircEaseOut":
-            result = Animators.CircEaseOut as IterativeAnimator;
-            break;
-          case "CubicEaseIn":
-            result = Animators.CubicEaseIn as IterativeAnimator;
-            break;
-          case "CubicEaseInOut":
-            result = Animators.CubicEaseInOut as IterativeAnimator;
-            break;
-          case "CubicEaseOut":
-            result = Animators.CubicEaseOut as IterativeAnimator;
-            break;
-          case "ElasticEaseIn":
-            result = Animators.ElasticEaseIn as IterativeAnimator;
-            break;
-          case "ElasticEaseInOut":
-            result = Animators.ElasticEaseInOut as IterativeAnimator;
-            break;
-          case "ElasticEaseOut":
-            result = Animators.ElasticEaseOut as IterativeAnimator;
-            break;
-          case "ExpoEaseIn":
-            result = Animators.ExpoEaseIn as IterativeAnimator;
-            break;
-          case "ExpoEaseInOut":
-            result = Animators.ExpoEaseInOut as IterativeAnimator;
-            break;
-          case "ExpoEaseOut":
-            result = Animators.ExpoEaseOut as IterativeAnimator;
-            break;
-          case "Linear":
-            result = Animators.Linear as IterativeAnimator;
-            break;
-          case "QuadEaseIn":
-            result = Animators.QuadEaseIn as IterativeAnimator;
-            break;
-          case "QuadEaseInOut":
-            result = Animators.QuadEaseInOut as IterativeAnimator;
-            break;
-          case "QuadEaseOut":
-            result = Animators.QuadEaseOut as IterativeAnimator;
-            break;
-          case "QuartEaseIn":
-            result = Animators.QuartEaseIn as IterativeAnimator;
-            break;
-          case "QuartEaseInOut":
-            result = Animators.QuartEaseInOut as IterativeAnimator;
-            break;
-          case "QuartEaseOut":
-            result = Animators.QuartEaseOut as IterativeAnimator;
-            break;
-          case "QuintEaseIn":
-            result = Animators.QuintEaseIn as IterativeAnimator;
-            break;
-          case "QuintEaseInOut":
-            result = Animators.QuintEaseInOut as IterativeAnimator;
-            break;
-          case "QuintEaseOut":
-            result = Animators.QuintEaseOut as IterativeAnimator;
-            break;
-          case "SineEaseIn":
-            result = Animators.SineEaseIn as IterativeAnimator;
-            break;
-          case "SineEaseInOut":
-            result = Animators.SineEaseInOut as IterativeAnimator;
-            break;
-          case "SineEaseOut":
-            result = Animators.SineEaseOut as IterativeAnimator;
-            break;
-        }
-      }
-
-      return result;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
deleted file mode 100644
index 3d051719..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
+++ /dev/null
@@ -1,581 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using Xceed.Wpf.Toolkit.Media.Animation;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public static class Animators
-  {
-    #region BackEaseIn Static Property
-
-    public static DoubleAnimator BackEaseIn
-    {
-      get
-      {
-        if( _backEaseIn == null )
-        {
-          _backEaseIn = new DoubleAnimator( PennerEquations.BackEaseIn );
-        }
-        return _backEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _backEaseIn;
-
-    #endregion
-
-    #region BackEaseInOut Static Property
-
-    public static DoubleAnimator BackEaseInOut
-    {
-      get
-      {
-        if( _backEaseInOut == null )
-        {
-          _backEaseInOut = new DoubleAnimator( PennerEquations.BackEaseInOut );
-        }
-        return _backEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _backEaseInOut;
-
-    #endregion
-
-    #region BackEaseOut Static Property
-
-    public static DoubleAnimator BackEaseOut
-    {
-      get
-      {
-        if( _backEaseOut == null )
-        {
-          _backEaseOut = new DoubleAnimator( PennerEquations.BackEaseOut );
-        }
-        return _backEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _backEaseOut;
-
-    #endregion
-
-    #region BounceEaseIn Static Property
-
-    public static DoubleAnimator BounceEaseIn
-    {
-      get
-      {
-        if( _bounceEaseIn == null )
-        {
-          _bounceEaseIn = new DoubleAnimator( PennerEquations.BounceEaseIn );
-        }
-        return _bounceEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _bounceEaseIn;
-
-    #endregion
-
-    #region BounceEaseInOut Static Property
-
-    public static DoubleAnimator BounceEaseInOut
-    {
-      get
-      {
-        if( _bounceEaseInOut == null )
-        {
-          _bounceEaseInOut = new DoubleAnimator( PennerEquations.BounceEaseInOut );
-        }
-        return _bounceEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _bounceEaseInOut;
-
-    #endregion
-
-    #region BounceEaseOut Static Property
-
-    public static DoubleAnimator BounceEaseOut
-    {
-      get
-      {
-        if( _bounceEaseOut == null )
-        {
-          _bounceEaseOut = new DoubleAnimator( PennerEquations.BounceEaseOut );
-        }
-        return _bounceEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _bounceEaseOut;
-
-    #endregion
-
-    #region CircEaseIn Static Property
-
-    public static DoubleAnimator CircEaseIn
-    {
-      get
-      {
-        if( _circEaseIn == null )
-        {
-          _circEaseIn = new DoubleAnimator( PennerEquations.CircEaseIn );
-        }
-        return _circEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _circEaseIn;
-
-    #endregion
-
-    #region CircEaseInOut Static Property
-
-    public static DoubleAnimator CircEaseInOut
-    {
-      get
-      {
-        if( _circEaseInOut == null )
-        {
-          _circEaseInOut = new DoubleAnimator( PennerEquations.CircEaseInOut );
-        }
-        return _circEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _circEaseInOut;
-
-    #endregion
-
-    #region CircEaseOut Static Property
-
-    public static DoubleAnimator CircEaseOut
-    {
-      get
-      {
-        if( _circEaseOut == null )
-        {
-          _circEaseOut = new DoubleAnimator( PennerEquations.CircEaseOut );
-        }
-        return _circEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _circEaseOut;
-
-    #endregion
-
-    #region CubicEaseIn Static Property
-
-    public static DoubleAnimator CubicEaseIn
-    {
-      get
-      {
-        if( _cubicEaseIn == null )
-        {
-          _cubicEaseIn = new DoubleAnimator( PennerEquations.CubicEaseIn );
-        }
-        return _cubicEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _cubicEaseIn;
-
-    #endregion
-
-    #region CubicEaseInOut Static Property
-
-    public static DoubleAnimator CubicEaseInOut
-    {
-      get
-      {
-        if( _cubicEaseInOut == null )
-        {
-          _cubicEaseInOut = new DoubleAnimator( PennerEquations.CubicEaseInOut );
-        }
-        return _cubicEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _cubicEaseInOut;
-
-    #endregion
-
-    #region CubicEaseOut Static Property
-
-    public static DoubleAnimator CubicEaseOut
-    {
-      get
-      {
-        if( _cubicEaseOut == null )
-        {
-          _cubicEaseOut = new DoubleAnimator( PennerEquations.CubicEaseOut );
-        }
-        return _cubicEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _cubicEaseOut;
-
-    #endregion
-
-    #region ElasticEaseIn Static Property
-
-    public static DoubleAnimator ElasticEaseIn
-    {
-      get
-      {
-        if( _elasticEaseIn == null )
-        {
-          _elasticEaseIn = new DoubleAnimator( PennerEquations.ElasticEaseIn );
-        }
-        return _elasticEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _elasticEaseIn;
-
-    #endregion
-
-    #region ElasticEaseInOut Static Property
-
-    public static DoubleAnimator ElasticEaseInOut
-    {
-      get
-      {
-        if( _elasticEaseInOut == null )
-        {
-          _elasticEaseInOut = new DoubleAnimator( PennerEquations.ElasticEaseInOut );
-        }
-        return _elasticEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _elasticEaseInOut;
-
-    #endregion
-
-    #region ElasticEaseOut Static Property
-
-    public static DoubleAnimator ElasticEaseOut
-    {
-      get
-      {
-        if( _elasticEaseOut == null )
-        {
-          _elasticEaseOut = new DoubleAnimator( PennerEquations.ElasticEaseOut );
-        }
-        return _elasticEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _elasticEaseOut;
-
-    #endregion
-
-    #region ExpoEaseIn Static Property
-
-    public static DoubleAnimator ExpoEaseIn
-    {
-      get
-      {
-        if( _expoEaseIn == null )
-        {
-          _expoEaseIn = new DoubleAnimator( PennerEquations.ExpoEaseIn );
-        }
-        return _expoEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _expoEaseIn;
-
-    #endregion
-
-    #region ExpoEaseInOut Static Property
-
-    public static DoubleAnimator ExpoEaseInOut
-    {
-      get
-      {
-        if( _expoEaseInOut == null )
-        {
-          _expoEaseInOut = new DoubleAnimator( PennerEquations.ExpoEaseInOut );
-        }
-        return _expoEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _expoEaseInOut;
-
-    #endregion
-
-    #region ExpoEaseOut Static Property
-
-    public static DoubleAnimator ExpoEaseOut
-    {
-      get
-      {
-        if( _expoEaseOut == null )
-        {
-          _expoEaseOut = new DoubleAnimator( PennerEquations.ExpoEaseOut );
-        }
-        return _expoEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _expoEaseOut;
-
-    #endregion
-
-    #region Linear Static Property
-
-    public static DoubleAnimator Linear
-    {
-      get
-      {
-        if( _linear == null )
-        {
-          _linear = new DoubleAnimator( PennerEquations.Linear );
-        }
-        return _linear;
-      }
-    }
-
-    private static DoubleAnimator _linear;
-
-    #endregion
-
-    #region QuadEaseIn Static Property
-
-    public static DoubleAnimator QuadEaseIn
-    {
-      get
-      {
-        if( _quadEaseIn == null )
-        {
-          _quadEaseIn = new DoubleAnimator( PennerEquations.QuadEaseIn );
-        }
-        return _quadEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _quadEaseIn;
-
-    #endregion
-
-    #region QuadEaseInOut Static Property
-
-    public static DoubleAnimator QuadEaseInOut
-    {
-      get
-      {
-        if( _quadEaseInOut == null )
-        {
-          _quadEaseInOut = new DoubleAnimator( PennerEquations.QuadEaseInOut );
-        }
-        return _quadEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _quadEaseInOut;
-
-    #endregion
-
-    #region QuadEaseOut Static Property
-
-    public static DoubleAnimator QuadEaseOut
-    {
-      get
-      {
-        if( _quadEaseOut == null )
-        {
-          _quadEaseOut = new DoubleAnimator( PennerEquations.QuadEaseOut );
-        }
-        return _quadEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _quadEaseOut;
-
-    #endregion
-
-    #region QuartEaseIn Static Property
-
-    public static DoubleAnimator QuartEaseIn
-    {
-      get
-      {
-        if( _quartEaseIn == null )
-        {
-          _quartEaseIn = new DoubleAnimator( PennerEquations.QuartEaseIn );
-        }
-        return _quartEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _quartEaseIn;
-
-    #endregion
-
-    #region QuartEaseInOut Static Property
-
-    public static DoubleAnimator QuartEaseInOut
-    {
-      get
-      {
-        if( _quartEaseInOut == null )
-        {
-          _quartEaseInOut = new DoubleAnimator( PennerEquations.QuartEaseInOut );
-        }
-        return _quartEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _quartEaseInOut;
-
-    #endregion
-
-    #region QuartEaseOut Static Property
-
-    public static DoubleAnimator QuartEaseOut
-    {
-      get
-      {
-        if( _quartEaseOut == null )
-        {
-          _quartEaseOut = new DoubleAnimator( PennerEquations.QuartEaseOut );
-        }
-        return _quartEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _quartEaseOut;
-
-    #endregion
-
-    #region QuintEaseIn Static Property
-
-    public static DoubleAnimator QuintEaseIn
-    {
-      get
-      {
-        if( _quintEaseIn == null )
-        {
-          _quintEaseIn = new DoubleAnimator( PennerEquations.QuintEaseIn );
-        }
-        return _quintEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _quintEaseIn;
-
-    #endregion
-
-    #region QuintEaseInOut Static Property
-
-    public static DoubleAnimator QuintEaseInOut
-    {
-      get
-      {
-        if( _quintEaseInOut == null )
-        {
-          _quintEaseInOut = new DoubleAnimator( PennerEquations.QuintEaseInOut );
-        }
-        return _quintEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _quintEaseInOut;
-
-    #endregion
-
-    #region QuintEaseOut Static Property
-
-    public static DoubleAnimator QuintEaseOut
-    {
-      get
-      {
-        if( _quintEaseOut == null )
-        {
-          _quintEaseOut = new DoubleAnimator( PennerEquations.QuintEaseOut );
-        }
-        return _quintEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _quintEaseOut;
-
-    #endregion
-
-    #region SineEaseIn Static Property
-
-    public static DoubleAnimator SineEaseIn
-    {
-      get
-      {
-        if( _sineEaseIn == null )
-        {
-          _sineEaseIn = new DoubleAnimator( PennerEquations.SineEaseIn );
-        }
-        return _sineEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _sineEaseIn;
-
-    #endregion
-
-    #region SineEaseInOut Static Property
-
-    public static DoubleAnimator SineEaseInOut
-    {
-      get
-      {
-        if( _sineEaseInOut == null )
-        {
-          _sineEaseInOut = new DoubleAnimator( PennerEquations.SineEaseInOut );
-        }
-        return _sineEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _sineEaseInOut;
-
-    #endregion
-
-    #region SineEaseOut Static Property
-
-    public static DoubleAnimator SineEaseOut
-    {
-      get
-      {
-        if( _sineEaseOut == null )
-        {
-          _sineEaseOut = new DoubleAnimator( PennerEquations.SineEaseOut );
-        }
-        return _sineEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _sineEaseOut;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
deleted file mode 100644
index a89d5edf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class ChildEnteredEventArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public ChildEnteredEventArgs( UIElement child, Rect arrangeRect )
-    {
-      _child = child;
-      _arrangeRect = arrangeRect;
-    }
-
-    #endregion
-
-    #region ArrangeRect Property
-
-    public Rect ArrangeRect
-    {
-      get
-      {
-        return _arrangeRect;
-      }
-    }
-
-    private readonly Rect _arrangeRect;
-
-    #endregion
-
-    #region Child Property
-
-    public UIElement Child
-    {
-      get
-      {
-        return _child;
-      }
-    }
-
-    private readonly UIElement _child;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
deleted file mode 100644
index ab5f4e85..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public delegate void ChildEnteredEventHandler( object sender, ChildEnteredEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
deleted file mode 100644
index 66d4acac..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class ChildEnteringEventArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public ChildEnteringEventArgs( UIElement child, Rect? enterFrom, Rect arrangeRect )
-    {
-      _child = child;
-      _enterFrom = enterFrom;
-      _arrangeRect = arrangeRect;
-    }
-
-    #endregion
-
-    #region ArrangeRect Property
-
-    public Rect ArrangeRect
-    {
-      get
-      {
-        return _arrangeRect;
-      }
-    }
-
-    private readonly Rect _arrangeRect;
-
-    #endregion
-
-    #region Child Property
-
-    public UIElement Child
-    {
-      get
-      {
-        return _child;
-      }
-    }
-
-    private readonly UIElement _child;
-
-    #endregion
-
-    #region EnterFrom Property
-
-    public Rect? EnterFrom
-    {
-      get
-      {
-        return _enterFrom;
-      }
-      set
-      {
-        _enterFrom = value;
-      }
-    }
-
-    private Rect? _enterFrom; //null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
deleted file mode 100644
index d0fb56c1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public delegate void ChildEnteringEventHandler( object sender, ChildEnteringEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
deleted file mode 100644
index a1dd43b0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class ChildExitedEventArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public ChildExitedEventArgs( UIElement child )
-    {
-      _child = child;
-    }
-
-    #endregion
-
-    #region Child Property
-
-    public UIElement Child
-    {
-      get
-      {
-        return _child;
-      }
-    }
-
-    private readonly UIElement _child;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
deleted file mode 100644
index 64faa9e4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public delegate void ChildExitedEventHandler( object sender, ChildExitedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
deleted file mode 100644
index 7d7d53b7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class ChildExitingEventArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public ChildExitingEventArgs( UIElement child, Rect? exitTo, Rect arrangeRect )
-    {
-      _child = child;
-      _exitTo = exitTo;
-      _arrangeRect = arrangeRect;
-    }
-
-    #endregion
-
-    #region ArrangeRect Property
-
-    public Rect ArrangeRect
-    {
-      get
-      {
-        return _arrangeRect;
-      }
-    }
-
-    private readonly Rect _arrangeRect;
-
-    #endregion
-
-    #region Child Property
-
-    public UIElement Child
-    {
-      get
-      {
-        return _child;
-      }
-    }
-
-    private readonly UIElement _child;
-
-    #endregion
-
-    #region ExitTo Property
-
-    public Rect? ExitTo
-    {
-      get
-      {
-        return _exitTo;
-      }
-      set
-      {
-        _exitTo = value;
-      }
-    }
-
-    private Rect? _exitTo; //null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
deleted file mode 100644
index e0410522..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public delegate void ChildExitingEventHandler( object sender, ChildExitingEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
deleted file mode 100644
index 4a6af9b2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Media.Animation;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class DoubleAnimator : IterativeAnimator
-  {
-    #region Constructors
-
-    public DoubleAnimator( IterativeEquation<double> equation )
-    {
-      _equation = equation;
-    }
-
-    #endregion
-
-    public override Rect GetInitialChildPlacement( UIElement child, Rect currentPlacement,
-        Rect targetPlacement, AnimationPanel activeLayout, ref AnimationRate animationRate,
-        out object placementArgs, out bool isDone )
-    {
-      isDone = ( animationRate.HasSpeed && animationRate.Speed <= 0 ) || ( animationRate.HasDuration && animationRate.Duration.Ticks == 0 );
-      if( !isDone )
-      {
-        Vector startVector = new Vector( currentPlacement.Left + ( currentPlacement.Width / 2 ), currentPlacement.Top + ( currentPlacement.Height / 2 ) );
-        Vector finalVector = new Vector( targetPlacement.Left + ( targetPlacement.Width / 2 ), targetPlacement.Top + ( targetPlacement.Height / 2 ) );
-        Vector distanceVector = startVector - finalVector;
-        animationRate = new AnimationRate( animationRate.HasDuration ? animationRate.Duration
-            : TimeSpan.FromMilliseconds( distanceVector.Length / animationRate.Speed ) );
-      }
-      placementArgs = currentPlacement;
-      return currentPlacement;
-    }
-
-    public override Rect GetNextChildPlacement( UIElement child, TimeSpan currentTime,
-        Rect currentPlacement, Rect targetPlacement, AnimationPanel activeLayout,
-        AnimationRate animationRate, ref object placementArgs, out bool isDone )
-    {
-      Rect result = targetPlacement;
-      isDone = true;
-      if( _equation != null )
-      {
-        Rect from = ( Rect )placementArgs;
-        TimeSpan duration = animationRate.Duration;
-        isDone = currentTime >= duration;
-        if( !isDone )
-        {
-          double x = _equation.Evaluate( currentTime, from.Left, targetPlacement.Left, duration );
-          double y = _equation.Evaluate( currentTime, from.Top, targetPlacement.Top, duration );
-          double width = Math.Max( 0, _equation.Evaluate( currentTime, from.Width, targetPlacement.Width, duration ) );
-          double height = Math.Max( 0, _equation.Evaluate( currentTime, from.Height, targetPlacement.Height, duration ) );
-          result = new Rect( x, y, width, height );
-        }
-      }
-      return result;
-    }
-
-    #region Private Fields
-
-    private readonly IterativeEquation<double> _equation; //null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
deleted file mode 100644
index 1d079e2a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Media.Animation;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  [TypeConverter( typeof( AnimatorConverter ) )]
-  public abstract class IterativeAnimator
-  {
-    #region Default Static Property
-
-    public static IterativeAnimator Default
-    {
-      get
-      {
-        return _default;
-      }
-    }
-
-    private static readonly IterativeAnimator _default = new DefaultAnimator();
-
-    #endregion
-
-    public abstract Rect GetInitialChildPlacement(
-      UIElement child,
-      Rect currentPlacement,
-      Rect targetPlacement,
-      AnimationPanel activeLayout,
-      ref AnimationRate animationRate,
-      out object placementArgs,
-      out bool isDone );
-
-    public abstract Rect GetNextChildPlacement(
-      UIElement child,
-      TimeSpan currentTime,
-      Rect currentPlacement,
-      Rect targetPlacement,
-      AnimationPanel activeLayout,
-      AnimationRate animationRate,
-      ref object placementArgs,
-      out bool isDone );
-
-    #region DefaultAnimator Nested Type
-
-    private sealed class DefaultAnimator : IterativeAnimator
-    {
-      public override Rect GetInitialChildPlacement( UIElement child, Rect currentPlacement, Rect targetPlacement, AnimationPanel activeLayout, ref AnimationRate animationRate, out object placementArgs, out bool isDone )
-      {
-        throw new InvalidOperationException( ErrorMessages.GetMessage( ErrorMessages.DefaultAnimatorCantAnimate ) );
-      }
-
-      public override Rect GetNextChildPlacement( UIElement child, TimeSpan currentTime, Rect currentPlacement, Rect targetPlacement, AnimationPanel activeLayout, AnimationRate animationRate, ref object placementArgs, out bool isDone )
-      {
-        throw new InvalidOperationException( ErrorMessages.GetMessage( ErrorMessages.DefaultAnimatorCantAnimate ) );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
deleted file mode 100644
index 3217f008..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public abstract class PanelBase : Panel
-  {
-    #region Constructor
-
-    public PanelBase()
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
deleted file mode 100644
index 7a023c23..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class RandomPanel : AnimationPanel
-  {
-    #region MinimumWidth Property
-
-    public static readonly DependencyProperty MinimumWidthProperty =
-      DependencyProperty.Register( "MinimumWidth", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata(
-          10d,
-          new PropertyChangedCallback( RandomPanel.OnMinimumWidthChanged ),
-          new CoerceValueCallback( RandomPanel.CoerceMinimumWidth ) ) );
-
-    public double MinimumWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( RandomPanel.MinimumWidthProperty );
-      }
-      set
-      {
-        this.SetValue( RandomPanel.MinimumWidthProperty, value );
-      }
-    }
-
-    private static void OnMinimumWidthChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      RandomPanel panel = ( RandomPanel )d;
-
-      panel.CoerceValue( RandomPanel.MaximumWidthProperty );
-      panel.InvalidateMeasure();
-    }
-
-    private static object CoerceMinimumWidth( DependencyObject d, object baseValue )
-    {
-      RandomPanel panel = ( RandomPanel )d;
-      double value = ( double )baseValue;
-
-      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
-        return DependencyProperty.UnsetValue;
-
-      double maximum = panel.MaximumWidth;
-      if( value > maximum )
-        return maximum;
-
-      return baseValue;
-    }
-
-    #endregion
-
-    #region MinimumHeight Property
-
-    public static readonly DependencyProperty MinimumHeightProperty =
-      DependencyProperty.Register( "MinimumHeight", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata(
-          10d,
-          new PropertyChangedCallback( RandomPanel.OnMinimumHeightChanged ),
-          new CoerceValueCallback( RandomPanel.CoerceMinimumHeight ) ) );
-
-    public double MinimumHeight
-    {
-      get
-      {
-        return ( double )this.GetValue( RandomPanel.MinimumHeightProperty );
-      }
-      set
-      {
-        this.SetValue( RandomPanel.MinimumHeightProperty, value );
-      }
-    }
-
-    private static void OnMinimumHeightChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      RandomPanel panel = ( RandomPanel )d;
-
-      panel.CoerceValue( RandomPanel.MaximumHeightProperty );
-      panel.InvalidateMeasure();
-    }
-
-    private static object CoerceMinimumHeight( DependencyObject d, object baseValue )
-    {
-      RandomPanel panel = ( RandomPanel )d;
-      double value = ( double )baseValue;
-
-      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
-        return DependencyProperty.UnsetValue;
-
-      double maximum = panel.MaximumHeight;
-      if( value > maximum )
-        return maximum;
-
-      return baseValue;
-    }
-
-    #endregion
-
-    #region MaximumWidth Property
-
-    public static readonly DependencyProperty MaximumWidthProperty =
-      DependencyProperty.Register( "MaximumWidth", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata(
-          100d,
-          new PropertyChangedCallback( RandomPanel.OnMaximumWidthChanged ),
-          new CoerceValueCallback( RandomPanel.CoerceMaximumWidth ) ) );
-
-    public double MaximumWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( RandomPanel.MaximumWidthProperty );
-      }
-      set
-      {
-        this.SetValue( RandomPanel.MaximumWidthProperty, value );
-      }
-    }
-
-    private static void OnMaximumWidthChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      RandomPanel panel = ( RandomPanel )d;
-
-      panel.CoerceValue( RandomPanel.MinimumWidthProperty );
-      panel.InvalidateMeasure();
-    }
-
-    private static object CoerceMaximumWidth( DependencyObject d, object baseValue )
-    {
-      RandomPanel panel = ( RandomPanel )d;
-      double value = ( double )baseValue;
-
-      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
-        return DependencyProperty.UnsetValue;
-
-      double minimum = panel.MinimumWidth;
-      if( value < minimum )
-        return minimum;
-
-      return baseValue;
-    }
-
-    #endregion
-
-    #region MaximumHeight Property
-
-    public static readonly DependencyProperty MaximumHeightProperty =
-      DependencyProperty.Register( "MaximumHeight", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata(
-          100d,
-          new PropertyChangedCallback( RandomPanel.OnMaximumHeightChanged ),
-          new CoerceValueCallback( RandomPanel.CoerceMaximumHeight ) ) );
-
-    public double MaximumHeight
-    {
-      get
-      {
-        return ( double )this.GetValue( RandomPanel.MaximumHeightProperty );
-      }
-      set
-      {
-        this.SetValue( RandomPanel.MaximumHeightProperty, value );
-      }
-    }
-
-    private static void OnMaximumHeightChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      RandomPanel panel = ( RandomPanel )d;
-
-      panel.CoerceValue( RandomPanel.MinimumHeightProperty );
-      panel.InvalidateMeasure();
-    }
-
-    private static object CoerceMaximumHeight( DependencyObject d, object baseValue )
-    {
-      RandomPanel panel = ( RandomPanel )d;
-      double value = ( double )baseValue;
-
-      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
-        return DependencyProperty.UnsetValue;
-
-      double minimum = panel.MinimumHeight;
-      if( value < minimum )
-        return minimum;
-
-      return baseValue;
-    }
-
-    #endregion
-
-    #region Seed Property
-
-    public static readonly DependencyProperty SeedProperty =
-      DependencyProperty.Register( "Seed", typeof( int ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 0,
-          new PropertyChangedCallback( RandomPanel.SeedChanged ) ) );
-
-    public int Seed
-    {
-      get
-      {
-        return ( int )this.GetValue( RandomPanel.SeedProperty );
-      }
-      set
-      {
-        this.SetValue( RandomPanel.SeedProperty, value );
-      }
-    }
-
-    private static void SeedChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args )
-    {
-      if( obj is RandomPanel )
-      {
-        RandomPanel owner = ( RandomPanel )obj;
-        owner._random = new Random( ( int )args.NewValue );
-        owner.InvalidateArrange();
-      }
-    }
-
-    #endregion
-
-    #region ActualSize Private Property
-
-    // Using a DependencyProperty as the backing store for ActualSize.  This enables animation, styling, binding, etc...
-    private static readonly DependencyProperty ActualSizeProperty =
-      DependencyProperty.RegisterAttached( "ActualSize", typeof( Size ), typeof( RandomPanel ),
-        new UIPropertyMetadata( new Size() ) );
-
-    private static Size GetActualSize( DependencyObject obj )
-    {
-      return ( Size )obj.GetValue( RandomPanel.ActualSizeProperty );
-    }
-
-    private static void SetActualSize( DependencyObject obj, Size value )
-    {
-      obj.SetValue( RandomPanel.ActualSizeProperty, value );
-    }
-
-    #endregion
-
-    protected override Size MeasureChildrenOverride( UIElementCollection children, Size constraint )
-    {
-      Size availableSize = new Size( double.PositiveInfinity, double.PositiveInfinity );
-
-      foreach( UIElement child in children )
-      {
-        if( child == null )
-          continue;
-
-        Size childSize = new Size( 1d * _random.Next( Convert.ToInt32( MinimumWidth ), Convert.ToInt32( MaximumWidth ) ),
-                                   1d * _random.Next( Convert.ToInt32( MinimumHeight ), Convert.ToInt32( MaximumHeight ) ) );
-
-        child.Measure( childSize );
-        RandomPanel.SetActualSize( child, childSize );
-      }
-      return new Size();
-    }
-
-    protected override Size ArrangeChildrenOverride( UIElementCollection children, Size finalSize )
-    {
-      foreach( UIElement child in children )
-      {
-        if( child == null )
-          continue;
-
-        Size childSize = RandomPanel.GetActualSize( child );
-
-        double x = _random.Next( 0, ( int )( Math.Max( finalSize.Width - childSize.Width, 0 ) ) );
-        double y = _random.Next( 0, ( int )( Math.Max( finalSize.Height - childSize.Height, 0 ) ) );
-
-        double width = Math.Min( finalSize.Width, childSize.Width );
-        double height = Math.Min( finalSize.Height, childSize.Height );
-
-        this.ArrangeChild( child, new Rect( new Point( x, y ), new Size( width, height ) ) );
-      }
-      return finalSize;
-    }
-
-    #region Private Fields
-
-    private Random _random = new Random();
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
deleted file mode 100644
index 523041aa..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  internal static class ScrollHelper
-  {
-    public static bool ScrollLeastAmount( Rect physViewRect, Rect itemRect, out Vector newPhysOffset )
-    {
-      bool scrollNeeded = false;
-
-      newPhysOffset = new Vector();
-
-      if( physViewRect.Contains( itemRect ) == false )
-      {
-        // Check if child is inside the view horizontially.
-        if( itemRect.Left > physViewRect.Left && itemRect.Right < physViewRect.Right ||
-            DoubleHelper.AreVirtuallyEqual( itemRect.Left, physViewRect.Left ) == true )
-        {
-          newPhysOffset.X = itemRect.Left;
-        }
-        // Child is to the left of the view or is it bigger than the view
-        else if( itemRect.Left < physViewRect.Left || itemRect.Width > physViewRect.Width )
-        {
-          newPhysOffset.X = itemRect.Left;
-        }
-        // Child is to the right of the view
-        else
-        {
-          newPhysOffset.X = Math.Max( 0, physViewRect.Left + ( itemRect.Right - physViewRect.Right ) );
-        }
-
-        // Check if child is inside the view vertically.
-        if( itemRect.Top > physViewRect.Top && itemRect.Bottom < physViewRect.Bottom ||
-            DoubleHelper.AreVirtuallyEqual( itemRect.Top, physViewRect.Top ) == true )
-        {
-          newPhysOffset.Y = itemRect.Top;
-        }
-        // Child is the above the view or is it bigger than the view
-        else if( itemRect.Top < physViewRect.Top || itemRect.Height > physViewRect.Height )
-        {
-          newPhysOffset.Y = itemRect.Top;
-        }
-        // Child is below the view
-        else
-        {
-          newPhysOffset.Y = Math.Max( 0, physViewRect.Top + ( itemRect.Bottom - physViewRect.Bottom ) );
-        }
-
-        scrollNeeded = true;
-      }
-
-      return scrollNeeded;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
deleted file mode 100644
index c5a05da1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
+++ /dev/null
@@ -1,1383 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Threading;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Media.Animation;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class SwitchPanel : PanelBase, IScrollInfo
-  {
-    #region Static Fields
-
-    private static readonly Vector ZeroVector = new Vector();
-
-    #endregion
-
-    #region Constructors
-
-    public SwitchPanel()
-    {
-      this.SetLayouts( new ObservableCollection<AnimationPanel>() );
-      this.Loaded += new RoutedEventHandler( this.OnLoaded );
-    }
-
-    #endregion
-
-    #region AreLayoutSwitchesAnimated Property
-
-    public static readonly DependencyProperty AreLayoutSwitchesAnimatedProperty =
-      DependencyProperty.Register( "AreLayoutSwitchesAnimated", typeof( bool ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( true ) );
-
-    public bool AreLayoutSwitchesAnimated
-    {
-      get
-      {
-        return ( bool )this.GetValue( SwitchPanel.AreLayoutSwitchesAnimatedProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.AreLayoutSwitchesAnimatedProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ActiveLayout Property
-
-    private static readonly DependencyPropertyKey ActiveLayoutPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ActiveLayout", typeof( AnimationPanel ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.AffectsMeasure,
-          new PropertyChangedCallback( SwitchPanel.OnActiveLayoutChanged ) ) );
-
-    public static readonly DependencyProperty ActiveLayoutProperty = SwitchPanel.ActiveLayoutPropertyKey.DependencyProperty;
-
-    public AnimationPanel ActiveLayout
-    {
-      get
-      {
-        return ( AnimationPanel )this.GetValue( SwitchPanel.ActiveLayoutProperty );
-      }
-    }
-
-    protected void SetActiveLayout( AnimationPanel value )
-    {
-      this.SetValue( SwitchPanel.ActiveLayoutPropertyKey, value );
-    }
-
-    private static void OnActiveLayoutChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPanel )d ).OnActiveLayoutChanged( e );
-    }
-
-    protected virtual void OnActiveLayoutChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( _currentLayoutPanel != null )
-      {
-        _currentLayoutPanel.DeactivateLayout();
-      }
-      _currentLayoutPanel = e.NewValue as AnimationPanel;
-      if( _currentLayoutPanel != null )
-      {
-        IScrollInfo info = _currentLayoutPanel as IScrollInfo;
-        if( info != null && info.ScrollOwner != null )
-        {
-          info.ScrollOwner.InvalidateScrollInfo();
-        }
-
-        _currentLayoutPanel.ActivateLayout();
-      }
-
-      this.RaiseActiveLayoutChangedEvent();
-      this.Dispatcher.BeginInvoke(
-        DispatcherPriority.Normal,
-        ( ThreadStart )delegate()
-        {
-          this.UpdateSwitchTemplate();
-        } );
-    }
-
-    #endregion
-
-    #region ActiveLayoutIndex Property
-
-    public static readonly DependencyProperty ActiveLayoutIndexProperty =
-      DependencyProperty.Register( "ActiveLayoutIndex", typeof( int ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( -1,
-          new PropertyChangedCallback( SwitchPanel.OnActiveLayoutIndexChanged ), new CoerceValueCallback( SwitchPanel.CoerceActiveLayoutIndexValue ) ) );
-
-    public int ActiveLayoutIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( SwitchPanel.ActiveLayoutIndexProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.ActiveLayoutIndexProperty, value );
-      }
-    }
-
-    private static void OnActiveLayoutIndexChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPanel )d ).OnActiveLayoutIndexChanged( e );
-    }
-
-    protected virtual void OnActiveLayoutIndexChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.SetActiveLayout( ( this.Layouts.Count == 0 ) ? null : this.Layouts[ ActiveLayoutIndex ] );
-    }
-
-    private static object CoerceActiveLayoutIndexValue( DependencyObject d, object value )
-    {
-      int panelCount = ( d as SwitchPanel ).Layouts.Count;
-      int result = ( int )value;
-
-      if( result < 0 && panelCount > 0 )
-      {
-        result = 0;
-      }
-      else if( result >= panelCount )
-      {
-        result = panelCount - 1;
-      }
-
-      return result;
-    }
-
-    #endregion
-
-    #region ActiveSwitchTemplate Property
-
-    private static readonly DependencyPropertyKey ActiveSwitchTemplatePropertyKey =
-      DependencyProperty.RegisterReadOnly( "ActiveSwitchTemplate", typeof( DataTemplate ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( null, new PropertyChangedCallback( SwitchPanel.OnActiveSwitchTemplateChanged ) ) );
-
-    public static readonly DependencyProperty ActiveSwitchTemplateProperty = SwitchPanel.ActiveSwitchTemplatePropertyKey.DependencyProperty;
-
-    public DataTemplate ActiveSwitchTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( SwitchPanel.ActiveSwitchTemplateProperty );
-      }
-    }
-
-    protected void SetActiveSwitchTemplate( DataTemplate value )
-    {
-      this.SetValue( SwitchPanel.ActiveSwitchTemplatePropertyKey, value );
-    }
-
-    private static void OnActiveSwitchTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPanel )d ).OnActiveSwitchTemplateChanged( e );
-    }
-
-    protected virtual void OnActiveSwitchTemplateChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( _presenters.Count > 0 )
-      {
-        DataTemplate template = e.NewValue as DataTemplate;
-        List<UIElement> currentChildren = new List<UIElement>( this.InternalChildren.Count );
-        foreach( UIElement child in this.InternalChildren )
-        {
-          if( child == null )
-            continue;
-
-          currentChildren.Add( child );
-        }
-
-        foreach( SwitchPresenter presenter in _presenters )
-        {
-          if( presenter._switchRoot != null && currentChildren.Contains( presenter._switchRoot ) )
-          {
-            presenter.SwapTheTemplate( template, this.AreLayoutSwitchesAnimated );
-          }
-        }
-      }
-    }
-
-    #endregion
-
-    #region DefaultAnimationRate Property
-
-    public static readonly DependencyProperty DefaultAnimationRateProperty =
-      AnimationPanel.DefaultAnimationRateProperty.AddOwner( typeof( SwitchPanel ) );
-
-    public AnimationRate DefaultAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.DefaultAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.DefaultAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DefaultAnimator Property
-
-    public static readonly DependencyProperty DefaultAnimatorProperty =
-      AnimationPanel.DefaultAnimatorProperty.AddOwner( typeof( SwitchPanel ) );
-
-    public IterativeAnimator DefaultAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.DefaultAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.DefaultAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EnterAnimationRate Property
-
-    public static readonly DependencyProperty EnterAnimationRateProperty =
-      AnimationPanel.EnterAnimationRateProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate EnterAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.EnterAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.EnterAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EnterAnimator Property
-
-    public static readonly DependencyProperty EnterAnimatorProperty =
-      AnimationPanel.EnterAnimatorProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator EnterAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.EnterAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.EnterAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ExitAnimationRate Property
-
-    public static readonly DependencyProperty ExitAnimationRateProperty =
-      AnimationPanel.ExitAnimationRateProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate ExitAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.ExitAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.ExitAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ExitAnimator Property
-
-    public static readonly DependencyProperty ExitAnimatorProperty =
-      AnimationPanel.ExitAnimatorProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator ExitAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.ExitAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.ExitAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region LayoutAnimationRate Property
-
-    public static readonly DependencyProperty LayoutAnimationRateProperty =
-      AnimationPanel.LayoutAnimationRateProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate LayoutAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.LayoutAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.LayoutAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region LayoutAnimator Property
-
-    public static readonly DependencyProperty LayoutAnimatorProperty =
-      AnimationPanel.LayoutAnimatorProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator LayoutAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.LayoutAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.LayoutAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Layouts Property
-
-    private static readonly DependencyPropertyKey LayoutsPropertyKey =
-      DependencyProperty.RegisterReadOnly( "Layouts", typeof( ObservableCollection<AnimationPanel> ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.AffectsArrange,
-          new PropertyChangedCallback( SwitchPanel.OnLayoutsChanged ) ) );
-
-    public static readonly DependencyProperty LayoutsProperty = SwitchPanel.LayoutsPropertyKey.DependencyProperty;
-
-    public ObservableCollection<AnimationPanel> Layouts
-    {
-      get
-      {
-        return ( ObservableCollection<AnimationPanel> )this.GetValue( SwitchPanel.LayoutsProperty );
-      }
-    }
-
-    protected void SetLayouts( ObservableCollection<AnimationPanel> value )
-    {
-      this.SetValue( SwitchPanel.LayoutsPropertyKey, value );
-    }
-
-    private static void OnLayoutsChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPanel )d ).OnLayoutsChanged( e );
-    }
-
-    protected virtual void OnLayoutsChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( e.NewValue != null )
-      {
-        ( e.NewValue as ObservableCollection<AnimationPanel> ).CollectionChanged
-          += new NotifyCollectionChangedEventHandler( LayoutsCollectionChanged );
-      }
-      if( e.OldValue != null )
-      {
-        ( e.OldValue as ObservableCollection<AnimationPanel> ).CollectionChanged
-          -= new NotifyCollectionChangedEventHandler( LayoutsCollectionChanged );
-      }
-    }
-
-    #endregion
-
-    #region SwitchAnimationRate Property
-
-    public static readonly DependencyProperty SwitchAnimationRateProperty =
-      AnimationPanel.SwitchAnimationRateProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate SwitchAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.SwitchAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.SwitchAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchAnimator Property
-
-    public static readonly DependencyProperty SwitchAnimatorProperty =
-      AnimationPanel.SwitchAnimatorProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator SwitchAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.SwitchAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.SwitchAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchTemplate Property
-
-    public static readonly DependencyProperty SwitchTemplateProperty =
-      DependencyProperty.Register( "SwitchTemplate", typeof( DataTemplate ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( null,
-          new PropertyChangedCallback( SwitchPanel.OnSwitchTemplateChanged ) ) );
-
-    public DataTemplate SwitchTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( SwitchPanel.SwitchTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.SwitchTemplateProperty, value );
-      }
-    }
-
-    private static void OnSwitchTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPanel )d ).OnSwitchTemplateChanged( e );
-    }
-
-    protected virtual void OnSwitchTemplateChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.UpdateSwitchTemplate();
-    }
-
-    #endregion
-
-    #region TemplateAnimationRate Property
-
-    public static readonly DependencyProperty TemplateAnimationRateProperty =
-      AnimationPanel.TemplateAnimationRateProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate TemplateAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.TemplateAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.TemplateAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region TemplateAnimator Property
-
-    public static readonly DependencyProperty TemplateAnimatorProperty =
-      AnimationPanel.TemplateAnimatorProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator TemplateAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.TemplateAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.TemplateAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region VisualChildrenCount Protected Property
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        int result = 0;
-
-        if( this.HasLoaded && _currentLayoutPanel != null )
-        {
-          result = _currentLayoutPanel.VisualChildrenCountInternal;
-        }
-        else
-        {
-          result = base.VisualChildrenCount;
-        }
-
-        return result;
-      }
-    }
-
-    #endregion
-
-    #region ExitingChildren Internal Property
-
-    internal List<UIElement> ExitingChildren
-    {
-      get
-      {
-        return _exitingChildren;
-      }
-    }
-
-    private readonly List<UIElement> _exitingChildren = new List<UIElement>();
-
-    #endregion
-
-    #region ChildrenInternal Internal Property
-
-    internal UIElementCollection ChildrenInternal
-    {
-      get
-      {
-        return this.InternalChildren;
-      }
-    }
-
-    #endregion
-
-    #region HasLoaded Internal Property
-
-    internal bool HasLoaded
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasLoaded ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.HasLoaded ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsScrollingPhysically Private Property
-
-    private bool IsScrollingPhysically
-    {
-      get
-      {
-        bool isScrollingPhys = false;
-
-        if( _scrollOwner != null )
-        {
-          isScrollingPhys = true;
-
-          if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          {
-            isScrollingPhys = ( ( IScrollInfo )this.ActiveLayout ).ScrollOwner == null;
-          }
-        }
-
-        return isScrollingPhys;
-      }
-    }
-
-    #endregion
-
-    #region ActiveLayoutChanged Event
-
-    public static readonly RoutedEvent ActiveLayoutChangedEvent =
-      EventManager.RegisterRoutedEvent( "ActiveLayoutChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( SwitchPanel ) );
-
-    public event RoutedEventHandler ActiveLayoutChanged
-    {
-      add
-      {
-        this.AddHandler( SwitchPanel.ActiveLayoutChangedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( SwitchPanel.ActiveLayoutChangedEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseActiveLayoutChangedEvent()
-    {
-      return SwitchPanel.RaiseActiveLayoutChangedEvent( this );
-    }
-
-    internal static RoutedEventArgs RaiseActiveLayoutChangedEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = SwitchPanel.ActiveLayoutChangedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region SwitchAnimationBegun Event
-
-    public static readonly RoutedEvent SwitchAnimationBegunEvent =
-      EventManager.RegisterRoutedEvent( "SwitchAnimationBegun", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( SwitchPanel ) );
-
-    public event RoutedEventHandler SwitchAnimationBegun
-    {
-      add
-      {
-        this.AddHandler( SwitchPanel.SwitchAnimationBegunEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( SwitchPanel.SwitchAnimationBegunEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseSwitchAnimationBegunEvent()
-    {
-      return SwitchPanel.RaiseSwitchAnimationBegunEvent( this );
-    }
-
-    private static RoutedEventArgs RaiseSwitchAnimationBegunEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = SwitchPanel.SwitchAnimationBegunEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region SwitchAnimationCompleted Event
-
-    public static readonly RoutedEvent SwitchAnimationCompletedEvent =
-      EventManager.RegisterRoutedEvent( "SwitchAnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( SwitchPanel ) );
-
-    public event RoutedEventHandler SwitchAnimationCompleted
-    {
-      add
-      {
-        this.AddHandler( SwitchPanel.SwitchAnimationCompletedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( SwitchPanel.SwitchAnimationCompletedEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseSwitchAnimationCompletedEvent()
-    {
-      return SwitchPanel.RaiseSwitchAnimationCompletedEvent( this );
-    }
-
-    private static RoutedEventArgs RaiseSwitchAnimationCompletedEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = SwitchPanel.SwitchAnimationCompletedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      AnimationPanel layout = ( Layouts.Count == 0 ) ? _defaultLayoutCanvas : this.ActiveLayout;
-      Size measureSize = layout.MeasureChildrenCore( this.InternalChildren, availableSize );
-
-      if( this.IsScrollingPhysically )
-      {
-        Size viewport = availableSize;
-        Size extent = measureSize;
-
-        //
-        // Make sure our offset works with the new size of the panel.  We don't want to show
-        // any whitespace if the user scrolled all the way down and then increased the size of the panel.
-        //
-        Vector newOffset = new Vector(
-          Math.Max( 0, Math.Min( _offset.X, extent.Width - viewport.Width ) ),
-          Math.Max( 0, Math.Min( _offset.Y, extent.Height - viewport.Height ) ) );
-
-        this.SetScrollingData( viewport, extent, newOffset );
-      }
-
-      return measureSize;
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      AnimationPanel layout = ( Layouts.Count == 0 ) ? _defaultLayoutCanvas : this.ActiveLayout;
-
-      if( this.IsScrollingPhysically )
-      {
-        layout.PhysicalScrollOffset = _offset;
-      }
-      else
-      {
-        layout.PhysicalScrollOffset = ZeroVector;
-      }
-
-      return layout.ArrangeChildrenCore( InternalChildren, finalSize );
-    }
-
-    protected override Visual GetVisualChild( int index )
-    {
-      if( this.HasLoaded && _currentLayoutPanel != null )
-        return _currentLayoutPanel.GetVisualChildInternal( index );
-
-      return base.GetVisualChild( index );
-    }
-
-    protected override void OnVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      // The OnNotifyVisualChildAdded/Removed methods get called for all animation panels within a 
-      // SwitchPanel.Layouts collection, regardless of whether they are the active layout for the SwitchPanel.
-      if( visualAdded is UIElement )
-      {
-        // do not issue notification for a child that is exiting
-        if( _currentLayoutPanel == null || !_currentLayoutPanel.IsRemovingInternalChild )
-        {
-          foreach( AnimationPanel panel in Layouts )
-          {
-            panel.OnNotifyVisualChildAddedInternal( visualAdded as UIElement );
-          }
-        }
-      }
-      else if( visualRemoved is UIElement )
-      {
-        foreach( AnimationPanel panel in Layouts )
-        {
-          panel.OnNotifyVisualChildRemovedInternal( visualRemoved as UIElement );
-        }
-      }
-
-      if( _currentLayoutPanel != null )
-      {
-        _currentLayoutPanel.OnSwitchParentVisualChildrenChanged( visualAdded, visualRemoved );
-      }
-      else
-      {
-        base.OnVisualChildrenChanged( visualAdded, visualRemoved );
-      }
-    }
-
-    internal void AddVisualChildInternal( Visual child )
-    {
-      this.AddVisualChild( child );
-    }
-
-    internal void BeginLayoutSwitch()
-    {
-      this.RaiseSwitchAnimationBegunEvent();
-    }
-
-    internal void EndLayoutSwitch()
-    {
-      this.RaiseSwitchAnimationCompletedEvent();
-    }
-
-    internal Visual GetVisualChildInternal( int index )
-    {
-      // called from AnimationPanel to access base class method
-      return base.GetVisualChild( index );
-    }
-
-    internal void OnVisualChildrenChangedInternal( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      base.OnVisualChildrenChanged( visualAdded, visualRemoved );
-    }
-
-    internal UIElement RegisterPresenter( SwitchPresenter presenter )
-    {
-      UIElement result = null;
-      AnimationPanel ignore;
-      result = AnimationPanel.FindAncestorChildOfAnimationPanel( presenter, out ignore );
-      if( result != null )
-      {
-        _presenters.Add( presenter );
-        presenter.SwapTheTemplate( ActiveSwitchTemplate, false );
-      }
-      return result;
-    }
-
-    internal void RemoveVisualChildInternal( Visual child )
-    {
-      this.RemoveVisualChild( child );
-    }
-
-    internal void UnregisterPresenter( SwitchPresenter presenter, DependencyObject container )
-    {
-      if( container != null )
-      {
-        _presenters.Remove( presenter );
-        presenter.SwapTheTemplate( null, false );
-      }
-    }
-
-    internal void UpdateSwitchTemplate()
-    {
-      this.SetActiveSwitchTemplate( ( this.ActiveLayout == null ) || ( this.ActiveLayout.SwitchTemplate == null )
-          ? this.SwitchTemplate : this.ActiveLayout.SwitchTemplate );
-    }
-
-    private void OnLoaded( object sender, RoutedEventArgs e )
-    {
-      this.HasLoaded = true;
-
-      // invalidate arrange to give enter animations a chance to run
-      this.InvalidateArrange();
-    }
-
-    private void LayoutsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( e.Action != NotifyCollectionChangedAction.Move )
-      {
-        if( e.NewItems != null )
-        {
-          foreach( AnimationPanel panel in e.NewItems )
-          {
-            this.AddLogicalChild( panel );
-            panel.SetSwitchParent( this );
-
-            if( panel is IScrollInfo )
-            {
-              ( ( IScrollInfo )panel ).ScrollOwner = this.ScrollOwner;
-            }
-
-            if( this.IsLoaded )
-            {
-              foreach( UIElement child in this.InternalChildren )
-              {
-                if( child == null )
-                  continue;
-
-                panel.OnNotifyVisualChildAddedInternal( child );
-              }
-            }
-          }
-        }
-
-        if( e.OldItems != null )
-        {
-          foreach( AnimationPanel panel in e.OldItems )
-          {
-            if( IsLoaded )
-            {
-              foreach( UIElement child in this.InternalChildren )
-              {
-                if( child == null )
-                  continue;
-
-                panel.OnNotifyVisualChildRemovedInternal( child );
-              }
-            }
-
-            this.RemoveLogicalChild( panel );
-            panel.SetSwitchParent( null );
-
-            if( panel is IScrollInfo )
-            {
-              ( ( IScrollInfo )panel ).ScrollOwner = null;
-            }
-          }
-        }
-      }
-
-      // ensure valid ActiveLayoutIndex value
-      this.CoerceValue( SwitchPanel.ActiveLayoutIndexProperty );
-      this.SetActiveLayout( ( this.Layouts.Count == 0 ) ? null : this.Layouts[ ActiveLayoutIndex ] );
-    }
-
-    private void ResetScrollInfo()
-    {
-      _offset = new Vector();
-      _viewport = _extent = new Size( 0, 0 );
-    }
-
-    private void OnScrollChange()
-    {
-      if( this.ScrollOwner != null )
-      {
-        this.ScrollOwner.InvalidateScrollInfo();
-      }
-    }
-
-    private void SetScrollingData( Size viewport, Size extent, Vector offset )
-    {
-      _offset = offset;
-
-      if( DoubleHelper.AreVirtuallyEqual( viewport, _viewport ) == false || DoubleHelper.AreVirtuallyEqual( extent, _extent ) == false ||
-          DoubleHelper.AreVirtuallyEqual( offset, _computedOffset ) == false )
-      {
-        _viewport = viewport;
-        _extent = extent;
-        _computedOffset = offset;
-        this.OnScrollChange();
-      }
-    }
-
-    private double ValidateInputOffset( double offset, string parameterName )
-    {
-      if( double.IsNaN( offset ) )
-        throw new ArgumentOutOfRangeException( parameterName );
-
-      return Math.Max( 0d, offset );
-    }
-
-    private int FindChildFromVisual( Visual vis )
-    {
-      int index = -1;
-
-      DependencyObject parent = vis;
-      DependencyObject child = null;
-
-      do
-      {
-        child = parent;
-        parent = VisualTreeHelper.GetParent( child );
-      }
-      while( parent != null && parent != this );
-
-      if( parent == this )
-      {
-        index = this.Children.IndexOf( ( UIElement )child );
-      }
-
-      return index;
-    }
-
-    #region IScrollInfo Members
-
-    public bool CanHorizontallyScroll
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          return ( ( IScrollInfo )this.ActiveLayout ).CanHorizontallyScroll;
-
-        return _allowHorizontal;
-      }
-      set
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        {
-          ( ( IScrollInfo )this.ActiveLayout ).CanHorizontallyScroll = value;
-        }
-        else
-        {
-          _allowHorizontal = value;
-        }
-      }
-    }
-
-    public bool CanVerticallyScroll
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          return ( ( IScrollInfo )this.ActiveLayout ).CanVerticallyScroll;
-
-        return _allowVertical;
-      }
-      set
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        {
-          ( ( IScrollInfo )this.ActiveLayout ).CanVerticallyScroll = value;
-        }
-        else
-        {
-          _allowVertical = value;
-        }
-      }
-    }
-
-    public double ExtentHeight
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          return ( ( IScrollInfo )this.ActiveLayout ).ExtentHeight;
-
-        return _extent.Height;
-      }
-    }
-
-    public double ExtentWidth
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          return ( ( IScrollInfo )this.ActiveLayout ).ExtentWidth;
-
-        return _extent.Width;
-      }
-    }
-
-    public double HorizontalOffset
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          return ( ( IScrollInfo )this.ActiveLayout ).HorizontalOffset;
-
-        return _offset.X;
-      }
-    }
-
-    public void LineDown()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).LineDown();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset + 1d );
-      }
-    }
-
-    public void LineLeft()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).LineLeft();
-      }
-      else
-      {
-        this.SetHorizontalOffset( this.VerticalOffset - 1d );
-      }
-    }
-
-    public void LineRight()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).LineRight();
-      }
-      else
-      {
-        this.SetHorizontalOffset( this.VerticalOffset + 1d );
-      }
-    }
-
-    public void LineUp()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).LineUp();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset + 1d );
-      }
-    }
-
-    public Rect MakeVisible( Visual visual, Rect rectangle )
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        return ( ( IScrollInfo )this.ActiveLayout ).MakeVisible( visual, rectangle );
-
-      if( ( rectangle.IsEmpty || ( visual == null ) ) || ( ( visual == this ) || !this.IsAncestorOf( visual ) ) )
-        return Rect.Empty;
-
-      rectangle = visual.TransformToAncestor( ( Visual )this ).TransformBounds( rectangle );
-
-      if( this.IsScrollingPhysically == false )
-        return rectangle;
-
-      //
-      // Make sure we can find the child...
-      //
-      int index = this.FindChildFromVisual( visual );
-
-      if( index == -1 )
-        throw new ArgumentException( "visual" );
-
-      //
-      // Since our _Offset pushes the items down we need to correct it here to 
-      // give a true rectangle of the child.
-      //
-      Rect itemRect = rectangle;
-      itemRect.Offset( _offset );
-
-      Rect viewRect = new Rect( new Point( _offset.X, _offset.Y ), _viewport );
-
-      Vector newPhysOffset;
-      if( ScrollHelper.ScrollLeastAmount( viewRect, itemRect, out newPhysOffset ) )
-      {
-        this.SetHorizontalOffset( newPhysOffset.X );
-        this.SetVerticalOffset( newPhysOffset.Y );
-      }
-
-      return rectangle;
-    }
-
-    public void MouseWheelDown()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )ActiveLayout ).MouseWheelDown();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset + SystemParameters.WheelScrollLines );
-      }
-    }
-
-    public void MouseWheelLeft()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).MouseWheelLeft();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset - 3d );
-      }
-    }
-
-    public void MouseWheelRight()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).MouseWheelRight();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset + 3d );
-      }
-    }
-
-    public void MouseWheelUp()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).MouseWheelUp();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset - SystemParameters.WheelScrollLines );
-      }
-    }
-
-    public void PageDown()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).PageDown();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset + this.ViewportHeight );
-      }
-    }
-
-    public void PageLeft()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).PageLeft();
-      }
-      else
-      {
-        this.SetHorizontalOffset( this.HorizontalOffset - this.ViewportWidth );
-      }
-    }
-
-    public void PageRight()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).PageRight();
-      }
-      else
-      {
-        this.SetHorizontalOffset( this.HorizontalOffset + this.ViewportWidth );
-      }
-    }
-
-    public void PageUp()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).PageUp();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset - this.ViewportHeight );
-      }
-    }
-
-    public ScrollViewer ScrollOwner
-    {
-      get
-      {
-        return _scrollOwner;
-      }
-      set
-      {
-        foreach( AnimationPanel layout in this.Layouts )
-        {
-          if( layout != null && layout is IScrollInfo )
-          {
-            ( ( IScrollInfo )layout ).ScrollOwner = value;
-          }
-        }
-
-        if( _scrollOwner != value )
-        {
-          _scrollOwner = value;
-
-          this.ResetScrollInfo();
-        }
-      }
-    }
-
-    public void SetHorizontalOffset( double offset )
-    {
-      offset = this.ValidateInputOffset( offset, "HorizontalOffset" );
-
-      offset = Math.Min( offset, this.ExtentWidth - this.ViewportWidth );
-
-      if( !DoubleHelper.AreVirtuallyEqual( offset, _offset.X ) )
-      {
-        _offset.X = offset;
-        base.InvalidateMeasure();
-      }
-    }
-
-    public void SetVerticalOffset( double offset )
-    {
-      offset = this.ValidateInputOffset( offset, "VerticalOffset" );
-
-      offset = Math.Min( offset, this.ExtentHeight - this.ViewportHeight );
-
-      if( !DoubleHelper.AreVirtuallyEqual( offset, _offset.Y ) )
-      {
-        _offset.Y = offset;
-        base.InvalidateMeasure();
-      }
-    }
-
-    public double VerticalOffset
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        {
-          return ( ( IScrollInfo )this.ActiveLayout ).VerticalOffset;
-        }
-
-        return _offset.Y;
-      }
-    }
-
-    public double ViewportHeight
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        {
-          return ( ( IScrollInfo )this.ActiveLayout ).ViewportHeight;
-        }
-
-        return _viewport.Height;
-      }
-    }
-
-    public double ViewportWidth
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        {
-          return ( ( IScrollInfo )this.ActiveLayout ).ViewportWidth;
-        }
-
-        return _viewport.Width;
-      }
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    internal AnimationPanel _currentLayoutPanel = null;
-
-    private readonly AnimationPanel _defaultLayoutCanvas = new Xceed.Wpf.Toolkit.Panels.WrapPanel();
-    private readonly Collection<SwitchPresenter> _presenters = new Collection<SwitchPresenter>();
-
-    private BitVector32 _cacheBits = new BitVector32( 0 );
-
-    private bool _allowHorizontal = false;
-    private bool _allowVertical = false;
-    private Vector _computedOffset = new Vector( 0.0, 0.0 );
-    private Size _extent = new Size( 0, 0 );
-    private Vector _offset = new Vector( 0, 0 );
-    private ScrollViewer _scrollOwner = null;
-    private Size _viewport;
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      HasLoaded = 0x00000001,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
deleted file mode 100644
index b4585aa7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class SwitchPresenter : FrameworkElement
-  {
-    #region Constructors
-
-    public SwitchPresenter()
-      : base()
-    {
-      this.AddVisualChild( _contentPresenter );
-
-      this.Loaded += new RoutedEventHandler( this.SwitchPresenter_Loaded );
-      this.Unloaded += new RoutedEventHandler( this.SwitchPresenter_Unloaded );
-    }
-
-    #endregion
-
-    #region DelaySwitch Property
-
-    // Using a DependencyProperty as the backing store for DelaySwitch.  This enables animation, styling, binding, etc...
-    public static readonly DependencyProperty DelaySwitchProperty =
-      DependencyProperty.Register( "DelaySwitch", typeof( bool ), typeof( SwitchPresenter ), 
-        new UIPropertyMetadata( false ) );
-
-    public bool DelaySwitch
-    {
-      get
-      {
-        return ( bool )this.GetValue( SwitchPresenter.DelaySwitchProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPresenter.DelaySwitchProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DelayPriority Property
-
-    // Using a DependencyProperty as the backing store for DelayPriority.  This enables animation, styling, binding, etc...
-    public static readonly DependencyProperty DelayPriorityProperty =
-      DependencyProperty.Register( "DelayPriority", typeof( DispatcherPriority ), typeof( SwitchPresenter ),
-        new UIPropertyMetadata( DispatcherPriority.Background ) );
-
-    public DispatcherPriority DelayPriority
-    {
-      get
-      {
-        return ( DispatcherPriority )this.GetValue( SwitchPresenter.DelayPriorityProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPresenter.DelayPriorityProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchParent Internal Property
-
-    internal static readonly DependencyProperty SwitchParentProperty =
-      DependencyProperty.Register( "SwitchParent", typeof( SwitchPanel ), typeof( SwitchPresenter ),
-        new FrameworkPropertyMetadata( null, 
-          new PropertyChangedCallback( SwitchPresenter.OnSwitchParentChanged ) ) );
-
-    internal SwitchPanel SwitchParent
-    {
-      get
-      {
-        return ( SwitchPanel )this.GetValue( SwitchPresenter.SwitchParentProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPresenter.SwitchParentProperty, value );
-      }
-    }
-
-    private static void OnSwitchParentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPresenter )d ).OnSwitchParentChanged( e );
-    }
-
-    protected virtual void OnSwitchParentChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( e.OldValue != null )
-      {
-        ( e.OldValue as SwitchPanel ).UnregisterPresenter( this, _switchRoot );
-        _switchRoot = null;
-        BindingOperations.ClearAllBindings( _contentPresenter );
-      }
-
-      if( e.NewValue != null )
-      {
-        _contentPresenter.SetBinding( ContentPresenter.ContentProperty, new Binding() );
-        _switchRoot = ( e.NewValue as SwitchPanel ).RegisterPresenter( this );
-      }
-    }
-
-    private static void OnLoaded( object sender, RoutedEventArgs e )
-    {
-      SwitchPresenter sp = sender as SwitchPresenter;
-      if( sp._switchRoot == null )
-      {
-        sp.SwitchParent = VisualTreeHelperEx.FindAncestorByType( sp, typeof( SwitchPanel ), false ) as SwitchPanel;
-      }
-    }
-
-    private static void OnUnloaded( object sender, RoutedEventArgs e )
-    {
-      ( sender as SwitchPresenter ).SwitchParent = null;
-    }
-
-    #endregion
-
-    #region VisualChildrenCount Protected Property
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return 1;
-      }
-    }
-
-    #endregion
-
-    internal void RegisterID( string id, FrameworkElement element )
-    {
-      if( element == null )
-        return;
-
-      _knownIDs[ id ] = element;
-    }
-
-    internal void SwapTheTemplate( DataTemplate template, bool beginAnimation )
-    {
-      if( this.DelaySwitch )
-      {
-        _currentTemplate = template;
-
-        this.Dispatcher.BeginInvoke( new Action<DelaySwitchParams>( this.OnSwapTemplate ),
-          this.DelayPriority,
-          new DelaySwitchParams()
-          {
-            Template = template,
-            BeginAnimation = beginAnimation
-          } );
-      }
-      else
-      {
-        this.DoSwapTemplate( template, beginAnimation );
-      }
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      // if first pass, resolve SwitchParent
-      if( !_isMeasured && _switchRoot == null )
-      {
-        SwitchPresenter.OnLoaded( this, null );
-        _isMeasured = true;
-      }
-
-      _contentPresenter.Measure( constraint );
-      return _contentPresenter.DesiredSize;
-    }
-
-    protected override Size ArrangeOverride( Size arrangeBounds )
-    {
-      _contentPresenter.Arrange( new Rect( arrangeBounds ) );
-      return arrangeBounds;
-    }
-
-    protected override Visual GetVisualChild( int index )
-    {
-      if( index != 0 )
-        throw new ArgumentOutOfRangeException( "index", index, "" );
-
-      return _contentPresenter;
-    }
-
-    private void OnSwapTemplate( DelaySwitchParams data )
-    {
-      // If we are switching the templates fast the invokes will lag. So ignore old invokes.
-      if( data.Template == _currentTemplate )
-      {
-        this.DoSwapTemplate( data.Template, data.BeginAnimation );
-        _currentTemplate = null;
-      }
-    }
-
-    private void DoSwapTemplate( DataTemplate template, bool beginAnimation )
-    {
-      // cache transforms for known ID'd elements in the current template
-      Dictionary<string, Rect> knownLocations = null;
-      if( beginAnimation && _knownIDs.Count > 0 )
-      {
-        knownLocations = new Dictionary<string, Rect>();
-        foreach( KeyValuePair<string, FrameworkElement> entry in _knownIDs )
-        {
-          Size size = entry.Value.RenderSize;
-          Matrix m = ( entry.Value.TransformToAncestor( SwitchParent ) as MatrixTransform ).Matrix;
-          Point[] points = { new Point(), new Point( size.Width, size.Height ) };
-          m.Transform( points );
-          knownLocations[ entry.Key ] = new Rect( points[ 0 ], points[ 1 ] );
-        }
-      }
-
-      // clear the known IDs because the new template will have all new IDs
-      _knownIDs.Clear();
-
-      // set and apply the new template
-      _contentPresenter.ContentTemplate = template;
-      if( template != null )
-      {
-        _contentPresenter.ApplyTemplate();
-      }
-
-      // determine locations of ID'd elements in new template
-      // and begin animation to new location
-      if( knownLocations != null && _knownIDs.Count > 0 )
-      {
-        Dictionary<string, Rect> newLocations = null;
-        RoutedEventHandler onLoaded = null;
-        onLoaded = delegate( object sender, RoutedEventArgs e )
-        {
-          FrameworkElement element = sender as FrameworkElement;
-          element.Loaded -= onLoaded;
-          string id = SwitchTemplate.GetID( element );
-          if( knownLocations.ContainsKey( id ) )
-          {
-            // ensure that the new locations have been resolved
-            if( newLocations == null )
-            {
-              newLocations = this.SwitchParent.ActiveLayout.GetNewLocationsBasedOnTargetPlacement( this, _switchRoot );
-            }
-
-            UIElement parent = VisualTreeHelper.GetParent( element ) as UIElement;
-            if( parent != null )
-            {
-              Rect previousLocation = knownLocations[ id ];
-              Point[] points = { previousLocation.TopLeft, previousLocation.BottomRight };
-              Matrix m = ( SwitchParent.TransformToDescendant( parent ) as MatrixTransform ).Matrix;
-              m.Transform( points );
-              Rect oldLocation = new Rect( points[ 0 ], points[ 1 ] );
-              Rect newLocation = newLocations[ id ];
-              this.SwitchParent.ActiveLayout.BeginGrandchildAnimation( element, oldLocation, newLocation );
-            }
-          }
-        };
-
-        foreach( KeyValuePair<string, FrameworkElement> entry in _knownIDs )
-        {
-          entry.Value.Loaded += onLoaded;
-        }
-      }
-    }
-
-    private void SwitchPresenter_Unloaded( object sender, RoutedEventArgs e )
-    {
-      this.SwitchParent = null;
-    }
-
-    private void SwitchPresenter_Loaded( object sender, RoutedEventArgs e )
-    {
-      if( _switchRoot == null )
-      {
-        this.SwitchParent = VisualTreeHelperEx.FindAncestorByType( this, typeof( SwitchPanel ), false ) as SwitchPanel;
-      }
-    }
-
-    #region Private Fields
-
-    // track our topmost ancestor that is the direct child of the SwitchPanel
-    internal UIElement _switchRoot = null;
-    internal Dictionary<string, FrameworkElement> _knownIDs = new Dictionary<string, FrameworkElement>();
-
-    private ContentPresenter _contentPresenter = new ContentPresenter();
-    private bool _isMeasured = false;
-
-    private DataTemplate _currentTemplate;
-
-    #endregion
-
-    #region DelaySwitchParams Nested Type
-
-    private struct DelaySwitchParams
-    {
-      public DataTemplate Template;
-      public bool BeginAnimation;
-    }
-
-    #endregion
-  }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
deleted file mode 100644
index 01c66fe2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Threading;
-using System.Windows;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public static class SwitchTemplate
-  {
-    #region ID Attached Property
-
-    public static readonly DependencyProperty IDProperty =
-      DependencyProperty.RegisterAttached( "ID", typeof( string ), typeof( SwitchTemplate ),
-        new FrameworkPropertyMetadata( null, 
-          new PropertyChangedCallback( SwitchTemplate.OnIDChanged ) ) );
-
-    public static string GetID( DependencyObject d )
-    {
-      return ( string )d.GetValue( SwitchTemplate.IDProperty );
-    }
-
-    public static void SetID( DependencyObject d, string value )
-    {
-      d.SetValue( SwitchTemplate.IDProperty, value );
-    }
-
-    private static void OnIDChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      if( ( e.NewValue == null ) || !( d is UIElement ) )
-        return;
-
-      SwitchPresenter parentPresenter = VisualTreeHelperEx.FindAncestorByType<SwitchPresenter>( d );
-      if( parentPresenter != null )
-      {
-        parentPresenter.RegisterID( e.NewValue as string, d as FrameworkElement );
-      }
-      else
-      {
-        d.Dispatcher.BeginInvoke( DispatcherPriority.Loaded,
-            ( ThreadStart )delegate()
-        {
-          parentPresenter = VisualTreeHelperEx.FindAncestorByType<SwitchPresenter>( d );
-          if( parentPresenter != null )
-          {
-            parentPresenter.RegisterID( e.NewValue as string, d as FrameworkElement );
-          }
-        } );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
deleted file mode 100644
index d99909ab..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class WrapPanel : AnimationPanel
-  {
-    #region Orientation Property
-
-    public static readonly DependencyProperty OrientationProperty =
-      StackPanel.OrientationProperty.AddOwner( typeof( WrapPanel ),
-        new FrameworkPropertyMetadata( Orientation.Horizontal, 
-          new PropertyChangedCallback( WrapPanel.OnOrientationChanged ) ) );
-
-    public Orientation Orientation
-    {
-      get
-      {
-        return _orientation;
-      }
-      set
-      {
-        base.SetValue( WrapPanel.OrientationProperty, value );
-      }
-    }
-
-    private static void OnOrientationChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      WrapPanel panel = ( WrapPanel )d;
-      panel._orientation = ( Orientation )e.NewValue;
-      panel.InvalidateMeasure();
-    }
-
-    private Orientation _orientation;
-
-    #endregion
-
-    #region ItemWidth Property
-
-    public static readonly DependencyProperty ItemWidthProperty =
-      DependencyProperty.Register( "ItemWidth", typeof( double ), typeof( WrapPanel ),
-        new FrameworkPropertyMetadata( double.NaN,
-          new PropertyChangedCallback( WrapPanel.OnInvalidateMeasure ) ), new ValidateValueCallback( WrapPanel.IsWidthHeightValid ) );
-
-    [TypeConverter( typeof( LengthConverter ) )]
-    public double ItemWidth
-    {
-      get
-      {
-        return ( double )base.GetValue( WrapPanel.ItemWidthProperty );
-      }
-      set
-      {
-        base.SetValue( WrapPanel.ItemWidthProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ItemHeight Property
-
-    public static readonly DependencyProperty ItemHeightProperty =
-      DependencyProperty.Register( "ItemHeight", typeof( double ), typeof( WrapPanel ),
-        new FrameworkPropertyMetadata( double.NaN,
-          new PropertyChangedCallback( WrapPanel.OnInvalidateMeasure ) ), new ValidateValueCallback( WrapPanel.IsWidthHeightValid ) );
-
-    [TypeConverter( typeof( LengthConverter ) )]
-    public double ItemHeight
-    {
-      get
-      {
-        return ( double )base.GetValue( WrapPanel.ItemHeightProperty );
-      }
-      set
-      {
-        base.SetValue( WrapPanel.ItemHeightProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsChildOrderReversed Property
-
-    public static readonly DependencyProperty IsStackReversedProperty =
-      DependencyProperty.Register( "IsChildOrderReversed", typeof( bool ), typeof( WrapPanel ),
-        new FrameworkPropertyMetadata( false, 
-          new PropertyChangedCallback( WrapPanel.OnInvalidateMeasure ) ) );
-
-    public bool IsChildOrderReversed
-    {
-      get
-      {
-        return ( bool )this.GetValue( WrapPanel.IsStackReversedProperty );
-      }
-      set
-      {
-        this.SetValue( WrapPanel.IsStackReversedProperty, value );
-      }
-    }
-
-    #endregion
-
-    protected override Size MeasureChildrenOverride( UIElementCollection children, Size constraint )
-    {
-      double desiredExtent = 0;
-      double desiredStack = 0;
-
-      bool isHorizontal = ( this.Orientation == Orientation.Horizontal );
-      double constraintExtent = ( isHorizontal ? constraint.Width : constraint.Height );
-
-      double itemWidth = ItemWidth;
-      double itemHeight = ItemHeight;
-      double itemExtent = ( isHorizontal ? itemWidth : itemHeight );
-
-      bool hasExplicitItemWidth = !double.IsNaN( itemWidth );
-      bool hasExplicitItemHeight = !double.IsNaN( itemHeight );
-      bool useItemExtent = ( isHorizontal ? hasExplicitItemWidth : hasExplicitItemHeight );
-
-      double lineExtent = 0;
-      double lineStack = 0;
-
-      Size childConstraint = new Size( ( hasExplicitItemWidth ? itemWidth : constraint.Width ),
-          ( hasExplicitItemHeight ? itemHeight : constraint.Height ) );
-
-      bool isReversed = this.IsChildOrderReversed;
-      int from = isReversed ? children.Count - 1 : 0;
-      int to = isReversed ? 0 : children.Count - 1;
-      int step = isReversed ? -1 : 1;
-
-      for( int i = from, pass = 0; pass < children.Count; i += step, pass++ )
-      {
-        UIElement child = children[ i ] as UIElement;
-
-        child.Measure( childConstraint );
-
-        double childExtent = isHorizontal
-            ? ( hasExplicitItemWidth ? itemWidth : child.DesiredSize.Width )
-            : ( hasExplicitItemHeight ? itemHeight : child.DesiredSize.Height );
-        double childStack = isHorizontal
-            ? ( hasExplicitItemHeight ? itemHeight : child.DesiredSize.Height )
-            : ( hasExplicitItemWidth ? itemWidth : child.DesiredSize.Width );
-
-        if( lineExtent + childExtent > constraintExtent )
-        {
-          desiredExtent = Math.Max( lineExtent, desiredExtent );
-          desiredStack += lineStack;
-          lineExtent = childExtent;
-          lineStack = childStack;
-
-          if( childExtent > constraintExtent )
-          {
-            desiredExtent = Math.Max( childExtent, desiredExtent );
-            desiredStack += childStack;
-            lineExtent = 0;
-            lineStack = 0;
-          }
-        }
-        else
-        {
-          lineExtent += childExtent;
-          lineStack = Math.Max( childStack, lineStack );
-        }
-      }
-
-      desiredExtent = Math.Max( lineExtent, desiredExtent );
-      desiredStack += lineStack;
-
-      return isHorizontal
-        ? new Size( desiredExtent, desiredStack )
-        : new Size( desiredStack, desiredExtent );
-    }
-
-    protected override Size ArrangeChildrenOverride( UIElementCollection children, Size finalSize )
-    {
-      bool isHorizontal = ( this.Orientation == Orientation.Horizontal );
-      double finalExtent = ( isHorizontal ? finalSize.Width : finalSize.Height );
-
-      double itemWidth = this.ItemWidth;
-      double itemHeight = this.ItemHeight;
-      double itemExtent = ( isHorizontal ? itemWidth : itemHeight );
-
-      bool hasExplicitItemWidth = !double.IsNaN( itemWidth );
-      bool hasExplicitItemHeight = !double.IsNaN( itemHeight );
-      bool useItemExtent = ( isHorizontal ? hasExplicitItemWidth : hasExplicitItemHeight );
-
-      double lineExtent = 0;
-      double lineStack = 0;
-      double lineStackSum = 0;
-
-      int from = this.IsChildOrderReversed ? children.Count - 1 : 0;
-      int to = this.IsChildOrderReversed ? 0 : children.Count - 1;
-      int step = this.IsChildOrderReversed ? -1 : 1;
-
-      Collection<UIElement> childrenInLine = new Collection<UIElement>();
-
-      for( int i = from, pass = 0; pass < children.Count; i += step, pass++ )
-      {
-        UIElement child = children[ i ] as UIElement;
-
-        double childExtent = isHorizontal
-            ? ( hasExplicitItemWidth ? itemWidth : child.DesiredSize.Width )
-            : ( hasExplicitItemHeight ? itemHeight : child.DesiredSize.Height );
-        double childStack = isHorizontal
-            ? ( hasExplicitItemHeight ? itemHeight : child.DesiredSize.Height )
-            : ( hasExplicitItemWidth ? itemWidth : child.DesiredSize.Width );
-
-        if( lineExtent + childExtent > finalExtent )
-        {
-          this.ArrangeLineOfChildren( childrenInLine, isHorizontal, lineStack, lineStackSum, itemExtent, useItemExtent );
-
-          lineStackSum += lineStack;
-          lineExtent = childExtent;
-
-          if( childExtent > finalExtent )
-          {
-            childrenInLine.Add( child );
-            this.ArrangeLineOfChildren( childrenInLine, isHorizontal, childStack, lineStackSum, itemExtent, useItemExtent );
-            lineStackSum += childStack;
-            lineExtent = 0;
-          }
-          childrenInLine.Add( child );
-        }
-        else
-        {
-          childrenInLine.Add( child );
-          lineExtent += childExtent;
-          lineStack = Math.Max( childStack, lineStack );
-        }
-      }
-
-      if( childrenInLine.Count > 0 )
-      {
-        this.ArrangeLineOfChildren( childrenInLine, isHorizontal, lineStack, lineStackSum, itemExtent, useItemExtent );
-      }
-
-      return finalSize;
-    }
-
-    private void ArrangeLineOfChildren( Collection<UIElement> children, bool isHorizontal, double lineStack, double lineStackSum, double itemExtent, bool useItemExtent )
-    {
-      double extent = 0;
-      foreach( UIElement child in children )
-      {
-        double childExtent = ( isHorizontal ? child.DesiredSize.Width : child.DesiredSize.Height );
-        double elementExtent = ( useItemExtent ? itemExtent : childExtent );
-        this.ArrangeChild( child, isHorizontal ? new Rect( extent, lineStackSum, elementExtent, lineStack )
-          : new Rect( lineStackSum, extent, lineStack, elementExtent ) );
-        extent += elementExtent;
-      }
-      children.Clear();
-    }
-
-    private static void OnInvalidateMeasure( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( AnimationPanel )d ).InvalidateMeasure();
-    }
-
-    private static bool IsWidthHeightValid( object value )
-    {
-      double num = ( double )value;
-      return ( DoubleHelper.IsNaN( num ) || ( ( num >= 0d ) && !double.IsPositiveInfinity( num ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
deleted file mode 100644
index 499ebdde..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
+++ /dev/null
@@ -1,628 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Specialized;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public sealed class Pie : ShapeBase
-  {
-    #region Constructors
-
-    static Pie()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( Pie ), new FrameworkPropertyMetadata( typeof( Pie ) ) );
-      // The default stretch mode of Pie is Fill
-      Pie.StretchProperty.OverrideMetadata( typeof( Pie ), new FrameworkPropertyMetadata( Stretch.Fill ) );
-      Pie.StrokeLineJoinProperty.OverrideMetadata( typeof( Pie ), new FrameworkPropertyMetadata( PenLineJoin.Round ) );
-    }
-
-    public Pie()
-      : base()
-    {
-    }
-
-    #endregion
-
-    #region EndAngle Property
-
-    public static readonly DependencyProperty EndAngleProperty =
-      DependencyProperty.Register( "EndAngle", typeof( double ), typeof( Pie ),
-        new FrameworkPropertyMetadata( 360d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-          new PropertyChangedCallback( Pie.OnEndAngleChanged ), new CoerceValueCallback( Pie.CoerceEndAngleValue ) ) );
-
-    public double EndAngle
-    {
-      get
-      {
-        return ( double )this.GetValue( Pie.EndAngleProperty );
-      }
-      set
-      {
-        this.SetValue( Pie.EndAngleProperty, value );
-      }
-    }
-
-    private static void OnEndAngleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Pie )d ).OnEndAngleChanged( e );
-    }
-
-    private void OnEndAngleChanged( DependencyPropertyChangedEventArgs e )
-    {
-      // avoid re-entrancy
-      if( this.IsUpdatingEndAngle )
-        return;
-
-      if( !( this.IsUpdatingStartAngle || this.IsUpdatingSlice || this.IsUpdatingSweepDirection ) )
-      {
-        switch( this.Mode )
-        {
-          case PieMode.Slice:
-            throw new InvalidOperationException( ErrorMessages.GetMessage( "EndAngleCannotBeSetDirectlyInSlice" ) );
-        }
-      }
-
-      // EndAngle, Slice, and SweepDirection are interrelated and must be kept in sync
-      this.IsUpdatingEndAngle = true;
-      try
-      {
-        if( this.Mode == PieMode.EndAngle )
-        {
-          this.CoerceValue( Pie.SweepDirectionProperty );
-        }
-        this.CoerceValue( Pie.SliceProperty );
-      }
-      finally
-      {
-        this.IsUpdatingEndAngle = false;
-      }
-    }
-
-    private static object CoerceEndAngleValue( DependencyObject d, object value )
-    {
-      // keep EndAngle in sync with Slice and SweepDirection
-      Pie pie = ( Pie )d;
-      if( pie.IsUpdatingSlice || pie.IsUpdatingSweepDirection
-          || ( pie.IsUpdatingStartAngle && pie.Mode == PieMode.Slice ) )
-      {
-        double newValue = pie.StartAngle + ( ( pie.SweepDirection == SweepDirection.Clockwise ) ? 1.0 : -1.0 ) * pie.Slice * 360;
-        if( !DoubleHelper.AreVirtuallyEqual( ( double )value, newValue ) )
-        {
-          value = newValue;
-        }
-      }
-      return value;
-    }
-
-    #endregion
-
-    #region Mode Property
-
-    public static readonly DependencyProperty ModeProperty =
-      DependencyProperty.Register( "Mode", typeof( PieMode ), typeof( Pie ),
-        new FrameworkPropertyMetadata( PieMode.Manual, new PropertyChangedCallback( Pie.OnModeChanged ) ) );
-
-    public PieMode Mode
-    {
-      get
-      {
-        return ( PieMode )this.GetValue( Pie.ModeProperty );
-      }
-      set
-      {
-        this.SetValue( Pie.ModeProperty, value );
-      }
-    }
-
-    private static void OnModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Pie )d ).OnModeChanged( e );
-    }
-
-    private void OnModeChanged( DependencyPropertyChangedEventArgs e )
-    {
-      // disallow reentrancy
-      if( this.IsUpdatingMode )
-        return;
-
-      this.IsUpdatingMode = true;
-      try
-      {
-        if( this.Mode == PieMode.EndAngle )
-        {
-          this.CoerceValue( Pie.SweepDirectionProperty );
-        }
-      }
-      finally
-      {
-        this.IsUpdatingMode = false;
-      }
-    }
-
-    #endregion
-
-    #region Slice Property
-
-    public static readonly DependencyProperty SliceProperty =
-      DependencyProperty.Register( "Slice", typeof( double ), typeof( Pie ),
-        new FrameworkPropertyMetadata( 1d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-          new PropertyChangedCallback( Pie.OnSliceChanged ), new CoerceValueCallback( Pie.CoerceSliceValue ) ), new ValidateValueCallback( Pie.ValidateSlice ) );
-
-    public double Slice
-    {
-      get
-      {
-        return ( double )this.GetValue( Pie.SliceProperty );
-      }
-      set
-      {
-        this.SetValue( Pie.SliceProperty, value );
-      }
-    }
-
-    private static void OnSliceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Pie )d ).OnSliceChanged( e );
-    }
-
-    private void OnSliceChanged( DependencyPropertyChangedEventArgs e )
-    {
-      // avoid re-entrancy
-      if( this.IsUpdatingSlice )
-        return;
-
-      if( !( this.IsUpdatingStartAngle || this.IsUpdatingEndAngle || this.IsUpdatingSweepDirection ) )
-      {
-        if( this.Mode == PieMode.EndAngle )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "SliceCannotBeSetDirectlyInEndAngle" ) );
-      }
-
-      // EndAngle and Slice are interrelated and must be kept in sync
-      this.IsUpdatingSlice = true;
-      try
-      {
-        if( !( this.IsUpdatingStartAngle || this.IsUpdatingEndAngle || ( this.Mode == PieMode.Manual && this.IsUpdatingSweepDirection ) ) )
-        {
-          this.CoerceValue( Pie.EndAngleProperty );
-        }
-      }
-      finally
-      {
-        this.IsUpdatingSlice = false;
-      }
-    }
-
-    private static object CoerceSliceValue( DependencyObject d, object value )
-    {
-      // keep Slice in sync with EndAngle, StartAngle, and SweepDirection
-      Pie pie = ( Pie )d;
-      if( pie.IsUpdatingEndAngle || pie.IsUpdatingStartAngle || pie.IsUpdatingSweepDirection )
-      {
-
-        double slice = Math.Max( -360.0, Math.Min( 360.0, ( pie.EndAngle - pie.StartAngle ) ) ) / ( ( pie.SweepDirection == SweepDirection.Clockwise ) ? 360.0 : -360.0 );
-        double newValue = DoubleHelper.AreVirtuallyEqual( slice, 0 ) ? 0 : ( slice < 0 ) ? slice + 1 : slice;
-        if( !DoubleHelper.AreVirtuallyEqual( ( double )value, newValue ) )
-        {
-          value = newValue;
-        }
-      }
-      return value;
-    }
-
-    private static bool ValidateSlice( object value )
-    {
-      double newValue = ( double )value;
-      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
-        throw new ArgumentException( ErrorMessages.GetMessage( "SliceOOR" ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region StartAngle Property
-
-    public static readonly DependencyProperty StartAngleProperty =
-      DependencyProperty.Register( "StartAngle", typeof( double ), typeof( Pie ),
-        new FrameworkPropertyMetadata( 360d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-          new PropertyChangedCallback( Pie.OnStartAngleChanged ) ) );
-
-    public double StartAngle
-    {
-      get
-      {
-        return ( double )this.GetValue( Pie.StartAngleProperty );
-      }
-      set
-      {
-        this.SetValue( Pie.StartAngleProperty, value );
-      }
-    }
-
-    private static void OnStartAngleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Pie )d ).OnStartAngleChanged( e );
-    }
-
-    private void OnStartAngleChanged( DependencyPropertyChangedEventArgs e )
-    {
-      // avoid re-entrancy
-      if( this.IsUpdatingStartAngle )
-        return;
-
-      // StartAngle, Slice, and SweepDirection are interrelated and must be kept in sync
-      this.IsUpdatingStartAngle = true;
-      try
-      {
-        switch( Mode )
-        {
-          case PieMode.Manual:
-            this.CoerceValue( Pie.SliceProperty );
-            break;
-
-          case PieMode.EndAngle:
-            this.CoerceValue( Pie.SweepDirectionProperty );
-            this.CoerceValue( Pie.SliceProperty );
-            break;
-
-          case PieMode.Slice:
-            this.CoerceValue( Pie.EndAngleProperty );
-            break;
-        }
-      }
-      finally
-      {
-        this.IsUpdatingStartAngle = false;
-      }
-    }
-
-    #endregion
-
-    #region SweepDirection Property
-
-    public static readonly DependencyProperty SweepDirectionProperty =
-      DependencyProperty.Register( "SweepDirection", typeof( SweepDirection ), typeof( Pie ),
-        new FrameworkPropertyMetadata( ( SweepDirection )SweepDirection.Clockwise, FrameworkPropertyMetadataOptions.AffectsRender,
-          new PropertyChangedCallback( Pie.OnSweepDirectionChanged ), new CoerceValueCallback( Pie.CoerceSweepDirectionValue ) ) );
-
-    public SweepDirection SweepDirection
-    {
-      get
-      {
-        return ( SweepDirection )this.GetValue( Pie.SweepDirectionProperty );
-      }
-      set
-      {
-        this.SetValue( Pie.SweepDirectionProperty, value );
-      }
-    }
-
-    private static void OnSweepDirectionChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Pie )d ).OnSweepDirectionChanged( e );
-    }
-
-    private void OnSweepDirectionChanged( DependencyPropertyChangedEventArgs e )
-    {
-      // avoid re-entrancy
-      if( this.IsUpdatingSweepDirection )
-        return;
-
-      // EndAngle, Slice, and SweepDirection are interrelated and must be kept in sync
-      this.IsUpdatingSweepDirection = true;
-      try
-      {
-        switch( Mode )
-        {
-          case PieMode.Slice:
-            this.CoerceValue( Pie.EndAngleProperty );
-            break;
-
-          default:
-            this.CoerceValue( Pie.SliceProperty );
-            break;
-        }
-      }
-      finally
-      {
-        this.IsUpdatingSweepDirection = false;
-      }
-    }
-
-    private static object CoerceSweepDirectionValue( DependencyObject d, object value )
-    {
-      // keep SweepDirection in sync with EndAngle and StartAngle
-      Pie pie = ( Pie )d;
-      if( pie.IsUpdatingEndAngle || pie.IsUpdatingStartAngle || pie.IsUpdatingMode )
-      {
-        if( DoubleHelper.AreVirtuallyEqual( pie.StartAngle, pie.EndAngle ) )
-        {
-          // if the values are equal, use previously coerced value
-          value = pie.SweepDirection;
-        }
-        else
-        {
-          value = ( pie.EndAngle < pie.StartAngle ) ? SweepDirection.Counterclockwise : SweepDirection.Clockwise;
-        }
-      }
-      return value;
-    }
-
-    #endregion
-
-    #region GeometryTransform Property
-
-    public override Transform GeometryTransform
-    {
-      get
-      {
-        return Transform.Identity;
-      }
-    }
-
-    #endregion
-
-    #region RenderedGeometry Property
-
-    public override Geometry RenderedGeometry
-    {
-      get
-      {
-        // for a Pie, the RenderedGeometry is the same as the DefiningGeometry
-        return this.DefiningGeometry;
-      }
-    }
-
-    #endregion
-
-    #region DefiningGeometry Protected Property
-
-    protected override Geometry DefiningGeometry
-    {
-      get
-      {
-        double slice = Slice;
-        if( _rect.IsEmpty || slice <= 0 )
-          return Geometry.Empty;
-
-        if( slice >= 1 )
-          return new EllipseGeometry( _rect );
-
-        // direction of flow is determined by the SweepDirection property
-        double directionalFactor = ( this.SweepDirection == SweepDirection.Clockwise ) ? 1.0 : -1.0;
-        double startAngle = StartAngle;
-
-        Point pointA = EllipseHelper.PointOfRadialIntersection( _rect, startAngle );
-        Point pointB = EllipseHelper.PointOfRadialIntersection( _rect, startAngle + directionalFactor * slice * 360 );
-        PathSegmentCollection segments = new PathSegmentCollection();
-        segments.Add( new LineSegment( pointA, true ) );
-        ArcSegment arc = new ArcSegment();
-        arc.Point = pointB;
-        arc.Size = new Size( _rect.Width / 2, _rect.Height / 2 );
-        arc.IsLargeArc = slice > 0.5;
-        arc.SweepDirection = SweepDirection;
-        segments.Add( arc );
-        PathFigureCollection figures = new PathFigureCollection();
-        figures.Add( new PathFigure( RectHelper.Center( _rect ), segments, true ) );
-        return new PathGeometry( figures );
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingEndAngle Private Property
-
-    private bool IsUpdatingEndAngle
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingEndAngle ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingEndAngle ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingMode Private Property
-
-    private bool IsUpdatingMode
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingMode ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingMode ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingSlice Private Property
-
-    private bool IsUpdatingSlice
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingSlice ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingSlice ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingStartAngle Private Property
-
-    private bool IsUpdatingStartAngle
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingStartAngle ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingStartAngle ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingSweepDirection Private Property
-
-    private bool IsUpdatingSweepDirection
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingSweepDirection ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingSweepDirection ] = value;
-      }
-    }
-
-    #endregion
-
-    internal override Size GetNaturalSize()
-    {
-      double strokeThickness = this.GetStrokeThickness();
-      return new Size( strokeThickness, strokeThickness );
-    }
-
-    internal override Rect GetDefiningGeometryBounds()
-    {
-      return _rect;
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      double penThickness = this.GetStrokeThickness();
-      double margin = penThickness / 2;
-
-      _rect = new Rect( margin, margin,
-          Math.Max( 0, finalSize.Width - penThickness ),
-          Math.Max( 0, finalSize.Height - penThickness ) );
-
-      switch( Stretch )
-      {
-        case Stretch.None:
-          // empty rectangle
-          _rect.Width = _rect.Height = 0;
-          break;
-
-        case Stretch.Fill:
-          // already initialized for Fill
-          break;
-
-        case Stretch.Uniform:
-          // largest square that fits in the final size
-          if( _rect.Width > _rect.Height )
-          {
-            _rect.Width = _rect.Height;
-          }
-          else
-          {
-            _rect.Height = _rect.Width;
-          }
-          break;
-
-        case Stretch.UniformToFill:
-
-          // smallest square that fills the final size
-          if( _rect.Width < _rect.Height )
-          {
-            _rect.Width = _rect.Height;
-          }
-          else
-          {
-            _rect.Height = _rect.Width;
-          }
-          break;
-      }
-
-      return finalSize;
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      if( this.Stretch == Stretch.UniformToFill )
-      {
-        double width = constraint.Width;
-        double height = constraint.Height;
-
-        if( Double.IsInfinity( width ) && Double.IsInfinity( height ) )
-        {
-          return this.GetNaturalSize();
-        }
-        else if( Double.IsInfinity( width ) || Double.IsInfinity( height ) )
-        {
-          width = Math.Min( width, height );
-        }
-        else
-        {
-          width = Math.Max( width, height );
-        }
-
-        return new Size( width, width );
-      }
-
-      return this.GetNaturalSize();
-    }
-
-    protected override void OnRender( DrawingContext drawingContext )
-    {
-      if( !_rect.IsEmpty )
-      {
-        Pen pen = this.GetPen();
-        drawingContext.DrawGeometry( this.Fill, pen, this.RenderedGeometry );
-      }
-    }
-
-    #region Private Fields
-
-    private Rect _rect = Rect.Empty;
-    private BitVector32 _cacheBits = new BitVector32( 0 );
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      IsUpdatingEndAngle = 0x00000001,
-      IsUpdatingMode = 0x00000002,
-      IsUpdatingSlice = 0x00000004,
-      IsUpdatingStartAngle = 0x00000008,
-      IsUpdatingSweepDirection = 0x00000010,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
deleted file mode 100644
index 583e4ab5..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum PieMode
-  {
-    Manual,
-    EndAngle,
-    Slice,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index cd89a90b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-    <!-- =============================================================================== -->
-    <!-- Pie                                                                             -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:Pie}" >
-       <Setter Property="Fill" Value="Black" />
-    </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
deleted file mode 100644
index 65b64557..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-   <!-- =============================================================================== -->
-   <!-- Pie                                                                             -->
-   <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:Pie}" >
-        <Setter Property="Fill" Value="Black" />
-    </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
deleted file mode 100644
index d72aaa87..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  internal class CachedTextInfo : ICloneable
-  {
-    private CachedTextInfo( string text, int caretIndex, int selectionStart, int selectionLength )
-    {
-      this.Text = text;
-      this.CaretIndex = caretIndex;
-      this.SelectionStart = selectionStart;
-      this.SelectionLength = selectionLength;
-    }
-
-    public CachedTextInfo( TextBox textBox )
-      : this( textBox.Text, textBox.CaretIndex, textBox.SelectionStart, textBox.SelectionLength )
-    {
-    }
-
-    public string Text { get; private set; }
-    public int CaretIndex { get; private set; }
-    public int SelectionStart { get; private set; }
-    public int SelectionLength { get; private set; }
-
-    #region ICloneable Members
-
-    public object Clone()
-    {
-      return new CachedTextInfo( this.Text, this.CaretIndex, this.SelectionStart, this.SelectionLength );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
deleted file mode 100644
index 7e5a907a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-#if VS2008
-using Microsoft.Windows.Controls;
-using Microsoft.Windows.Controls.Primitives;
-#endif
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  [TemplatePart( Name = PART_Popup, Type = typeof( Popup ) )]
-  public class DateTimePickerBase : DateTimeUpDown
-  {
-    private const string PART_Popup = "PART_Popup";
-
-    #region Members
-
-    private Popup _popup;
-    private DateTime? _initialValue;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DateTimePickerBase ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      DateTimePickerBase dateTimePicker = ( DateTimePickerBase )d;
-      if( dateTimePicker != null )
-        dateTimePicker.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-        _initialValue = Value;
-    }
-
-    #endregion //IsOpen
-
-    #region ShowDropDownButton
-
-    public static readonly DependencyProperty ShowDropDownButtonProperty = DependencyProperty.Register( "ShowDropDownButton", typeof( bool ), typeof( DateTimePickerBase ), new UIPropertyMetadata( true ) );
-    public bool ShowDropDownButton
-    {
-      get
-      {
-        return ( bool )GetValue( ShowDropDownButtonProperty );
-      }
-      set
-      {
-        SetValue( ShowDropDownButtonProperty, value );
-      }
-    }
-
-    #endregion //ShowDropDownButton
-
-    #endregion //Properties
-
-    #region Constructors
-
-    public DateTimePickerBase()
-    {
-      AddHandler( UIElement.KeyDownEvent, new KeyEventHandler( HandleKeyDown ), true );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _popup != null )
-      {
-        _popup.Opened -= this.Popup_Opened;
-      }
-
-      _popup = this.GetTemplateChild( PART_Popup ) as Popup;
-
-      if( _popup != null )
-      {
-        _popup.Opened += this.Popup_Opened;
-      }
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    protected virtual void HandleKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsOpen = true;
-          // Calendar will get focus in Calendar_Loaded().
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          ClosePopup( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Enter )
-        {
-          ClosePopup( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Escape )
-        {
-          // Avoid setting the "Value" property when no change has occurred.
-          // The original value may not be a local value. Setting
-          // it, even with the same value, will override a one-way binding.
-          if( !object.Equals( this.Value, _initialValue ) )
-          {
-            this.Value = _initialValue;
-          }
-          ClosePopup( true );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      ClosePopup( true );
-    }
-
-    protected virtual void Popup_Opened( object sender, EventArgs e )
-    {
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    protected void ClosePopup( bool isFocusOnTextBox )
-    {
-      if( IsOpen )
-      {
-        IsOpen = false;
-      }
-
-      ReleaseMouseCapture();
-
-      if( isFocusOnTextBox && ( TextBox != null ) )
-        TextBox.Focus();
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
deleted file mode 100644
index 5c98eac3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public abstract class DateTimeUpDownBase<T> : UpDownBase<T>
-  {
-    #region Members
-
-    internal List<DateTimeInfo> _dateTimeInfoList = new List<DateTimeInfo>();
-    internal DateTimeInfo _selectedDateTimeInfo;
-    internal bool _fireSelectionChangedEvent = true;
-    internal bool _processTextChanged = true;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region CurrentDateTimePart
-
-    public static readonly DependencyProperty CurrentDateTimePartProperty = DependencyProperty.Register( "CurrentDateTimePart", typeof( DateTimePart )
-      , typeof( DateTimeUpDownBase<T> ), new UIPropertyMetadata( DateTimePart.Other, OnCurrentDateTimePartChanged ) );
-    public DateTimePart CurrentDateTimePart
-    {
-      get
-      {
-        return (DateTimePart)GetValue( CurrentDateTimePartProperty );
-      }
-      set
-      {
-        SetValue( CurrentDateTimePartProperty, value );
-      }
-    }
-
-    private static void OnCurrentDateTimePartChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DateTimeUpDownBase<T> dateTimeUpDownBase = o as DateTimeUpDownBase<T>;
-      if( dateTimeUpDownBase != null )
-        dateTimeUpDownBase.OnCurrentDateTimePartChanged( (DateTimePart)e.OldValue, (DateTimePart)e.NewValue );
-    }
-
-    protected virtual void OnCurrentDateTimePartChanged( DateTimePart oldValue, DateTimePart newValue )
-    {
-      this.Select( this.GetDateTimeInfo( newValue ) );
-    }
-
-    #endregion //CurrentDateTimePart
-
-    #region Step
-
-    public static readonly DependencyProperty StepProperty = DependencyProperty.Register( "Step", typeof( int )
-      , typeof( DateTimeUpDownBase<T> ), new UIPropertyMetadata( 1, OnStepChanged ) );
-    public int Step
-    {
-      get
-      {
-        return (int)GetValue( StepProperty );
-      }
-      set
-      {
-        SetValue( StepProperty, value );
-      }
-    }
-
-    private static void OnStepChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var dateTimeUpDownBase = o as DateTimeUpDownBase<T>;
-      if( dateTimeUpDownBase != null )
-        dateTimeUpDownBase.OnStepChanged( (int)e.OldValue, (int)e.NewValue );
-    }
-
-    protected virtual void OnStepChanged( int oldValue, int newValue )
-    {
-    }
-
-    #endregion //Step
-
-    #endregion
-
-    #region Constructors
-
-    internal DateTimeUpDownBase()
-    {
-      this.InitializeDateTimeInfoList( this.Value );
-      this.Loaded += this.DateTimeUpDownBase_Loaded;
-    }
-
-    #endregion
-
-    #region BaseClass Overrides
-
-    public override void OnApplyTemplate()
-    {
-      if( this.TextBox != null )
-      {
-        this.TextBox.SelectionChanged -= this.TextBox_SelectionChanged;
-      }
-
-      base.OnApplyTemplate();
-
-      if( this.TextBox != null )
-      {
-        this.TextBox.SelectionChanged += this.TextBox_SelectionChanged;
-      }
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      int selectionStart = ( _selectedDateTimeInfo != null ) ? _selectedDateTimeInfo.StartPosition : 0;
-      int selectionLength = ( _selectedDateTimeInfo != null ) ? _selectedDateTimeInfo.Length : 0;
-
-      switch( e.Key )
-      {
-        case Key.Enter:
-          {
-            if( !IsReadOnly )
-            {
-              _fireSelectionChangedEvent = false;
-              BindingExpression binding = BindingOperations.GetBindingExpression( TextBox, System.Windows.Controls.TextBox.TextProperty );
-              binding.UpdateSource();
-              _fireSelectionChangedEvent = true;
-            }
-            return;
-          }
-        case Key.Add:
-          if( this.AllowSpin && !this.IsReadOnly )
-          {
-            this.DoIncrement();
-            e.Handled = true;
-          }
-          _fireSelectionChangedEvent = false;
-          break;
-        case Key.Subtract:
-          if( this.AllowSpin && !this.IsReadOnly )
-          {
-            this.DoDecrement();
-            e.Handled = true;
-          }
-          _fireSelectionChangedEvent = false;
-          break;
-        case Key.Right:
-          if( this.IsCurrentValueValid() )
-          {
-            this.PerformKeyboardSelection( selectionStart + selectionLength );
-            e.Handled = true;
-          }
-          _fireSelectionChangedEvent = false;
-          break;
-        case Key.Left:
-          if( this.IsCurrentValueValid() )
-          {
-            this.PerformKeyboardSelection( selectionStart > 0 ? selectionStart - 1 : 0 );
-            e.Handled = true;
-          }
-          _fireSelectionChangedEvent = false;
-          break;
-        default:
-          {
-            _fireSelectionChangedEvent = false;
-            break;
-          }
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    #endregion
-
-    #region Event Hanlders
-
-    private void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
-    {
-      if( _fireSelectionChangedEvent )
-        this.PerformMouseSelection();
-      else
-        _fireSelectionChangedEvent = true;
-    }
-
-    private void DateTimeUpDownBase_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.InitSelection();
-    }
-
-    #endregion
-
-    #region Methods
-
-    protected virtual void InitializeDateTimeInfoList( T value )
-    {
-    }
-
-    protected virtual bool IsCurrentValueValid()
-    {
-      return true;
-    }
-
-    protected virtual void PerformMouseSelection()
-    {
-      var dateTimeInfo = this.GetDateTimeInfo( TextBox.SelectionStart );
-      if( (dateTimeInfo != null) && (dateTimeInfo.Type == DateTimePart.Other) )
-      {
-        this.Dispatcher.BeginInvoke( DispatcherPriority.Background, new Action( () =>
-        {
-          // Select the next dateTime part
-          this.Select( this.GetDateTimeInfo( dateTimeInfo.StartPosition + dateTimeInfo.Length ) );
-        }
-        ) );
-        return;
-      }     
-
-      this.Select( dateTimeInfo );
-    }
-
-    protected virtual bool IsLowerThan( T value1, T value2 )
-    {
-      return false;
-    }
-
-    protected virtual bool IsGreaterThan( T value1, T value2 )
-    {
-      return false;
-    }
-
-    internal DateTimeInfo GetDateTimeInfo( int selectionStart )
-    {
-      return _dateTimeInfoList.FirstOrDefault( ( info ) =>
-                              ( info.StartPosition <= selectionStart ) && ( selectionStart < ( info.StartPosition + info.Length ) ) );
-    }
-
-    internal DateTimeInfo GetDateTimeInfo( DateTimePart part )
-    {
-      return _dateTimeInfoList.FirstOrDefault( ( info ) =>info.Type == part );
-    }
-
-    internal void Select( DateTimeInfo info )
-    {
-      if( (info != null) && !info.Equals( _selectedDateTimeInfo ) && ( this.TextBox != null) && !string.IsNullOrEmpty( this.TextBox.Text ) )
-      {
-        _fireSelectionChangedEvent = false;
-        this.TextBox.Select( info.StartPosition, info.Length );
-        _fireSelectionChangedEvent = true;
-        _selectedDateTimeInfo = info;
-#if VS2008
-        this.CurrentDateTimePart = info.Type;
-#else
-        this.SetCurrentValue( DateTimeUpDownBase<T>.CurrentDateTimePartProperty, info.Type );
-#endif
-      }
-    }
-
-    internal T CoerceValueMinMax( T value )
-    {
-      if( this.IsLowerThan( value, this.Minimum ) )
-        return this.Minimum;
-      else if( this.IsGreaterThan( value, this.Maximum ) )
-        return this.Maximum;
-      else
-        return value;
-    }
-
-    internal void ValidateDefaultMinMax( T value )
-    {
-      // DefaultValue is always accepted.
-      if( object.Equals( value, this.DefaultValue ) )
-        return;
-
-      if( this.IsLowerThan( value, this.Minimum ) )
-        throw new ArgumentOutOfRangeException( "Minimum", String.Format( "Value must be greater than MinValue of {0}", this.Minimum ) );
-      else if( this.IsGreaterThan( value, this.Maximum ) )
-        throw new ArgumentOutOfRangeException( "Maximum", String.Format( "Value must be less than MaxValue of {0}", this.Maximum ) );
-    }
-
-    internal T GetClippedMinMaxValue( T value )
-    {
-      if( this.IsGreaterThan( value, this.Maximum ) )
-        return this.Maximum;
-      else if( this.IsLowerThan( value, this.Minimum ) )
-        return this.Minimum;
-      return value;
-    }
-
-    protected internal virtual void PerformKeyboardSelection( int nextSelectionStart )
-    {
-      this.TextBox.Focus();
-
-      if( !this.UpdateValueOnEnterKey )
-      {
-        this.CommitInput();
-      }
-
-      int selectedDateStartPosition = ( _selectedDateTimeInfo != null ) ? _selectedDateTimeInfo.StartPosition : 0;
-      int direction = nextSelectionStart - selectedDateStartPosition;
-      if( direction > 0 )
-      {
-        this.Select( this.GetNextDateTimeInfo( nextSelectionStart ) );
-      }
-      else
-      {
-        this.Select( this.GetPreviousDateTimeInfo( nextSelectionStart - 1 ) );
-      }
-    }    
-
-    private DateTimeInfo GetNextDateTimeInfo( int nextSelectionStart )
-    {
-      DateTimeInfo nextDateTimeInfo = this.GetDateTimeInfo( nextSelectionStart );
-      if( nextDateTimeInfo == null )
-      {
-        nextDateTimeInfo = _dateTimeInfoList.First();
-      }
-
-      DateTimeInfo initialDateTimeInfo = nextDateTimeInfo;
-
-      while( nextDateTimeInfo.Type == DateTimePart.Other )
-      {
-        nextDateTimeInfo = this.GetDateTimeInfo( nextDateTimeInfo.StartPosition + nextDateTimeInfo.Length );
-        if( nextDateTimeInfo == null )
-        {
-          nextDateTimeInfo = _dateTimeInfoList.First();
-        }
-        if( object.Equals( nextDateTimeInfo, initialDateTimeInfo ) )
-          throw new InvalidOperationException( "Couldn't find a valid DateTimeInfo." );
-      }
-      return nextDateTimeInfo;
-    }
-
-    private DateTimeInfo GetPreviousDateTimeInfo( int previousSelectionStart )
-    {
-      DateTimeInfo previousDateTimeInfo = this.GetDateTimeInfo( previousSelectionStart );
-      if( previousDateTimeInfo == null )
-      {
-        if( _dateTimeInfoList.Count > 0 )
-        {
-          previousDateTimeInfo = _dateTimeInfoList.Last();
-        }
-      }
-
-      DateTimeInfo initialDateTimeInfo = previousDateTimeInfo;
-
-      while( (previousDateTimeInfo != null) && (previousDateTimeInfo.Type == DateTimePart.Other) )
-      {
-        previousDateTimeInfo = this.GetDateTimeInfo( previousDateTimeInfo.StartPosition - 1 );
-        if( previousDateTimeInfo == null )
-        {
-          previousDateTimeInfo = _dateTimeInfoList.Last();
-        }
-        if( object.Equals( previousDateTimeInfo, initialDateTimeInfo ) )
-          throw new InvalidOperationException( "Couldn't find a valid DateTimeInfo." );
-      }
-      return previousDateTimeInfo;
-    }
-
-    private void InitSelection()
-    {
-      if( _selectedDateTimeInfo == null )
-      {
-        this.Select( (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : this.GetDateTimeInfo( 0 ) );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
deleted file mode 100644
index e65f57fb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  internal struct HsvColor
-  {
-    public double H;
-    public double S;
-    public double V;
-
-    public HsvColor( double h, double s, double v )
-    {
-      H = h;
-      S = s;
-      V = v;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
deleted file mode 100644
index 8243acff..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public abstract class InputBase : Control
-  {
-    #region Properties
-
-    #region AllowTextInput
-
-    public static readonly DependencyProperty AllowTextInputProperty = DependencyProperty.Register( "AllowTextInput", typeof( bool ), typeof( InputBase ), new UIPropertyMetadata( true, OnAllowTextInputChanged ) );
-    public bool AllowTextInput
-    {
-      get
-      {
-        return ( bool )GetValue( AllowTextInputProperty );
-      }
-      set
-      {
-        SetValue( AllowTextInputProperty, value );
-      }
-    }
-
-    private static void OnAllowTextInputChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      InputBase inputBase = o as InputBase;
-      if( inputBase != null )
-        inputBase.OnAllowTextInputChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnAllowTextInputChanged( bool oldValue, bool newValue )
-    {
-    }
-
-    #endregion //AllowTextInput
-
-    #region CultureInfo
-
-    public static readonly DependencyProperty CultureInfoProperty = DependencyProperty.Register( "CultureInfo", typeof( CultureInfo ), typeof( InputBase ), new UIPropertyMetadata( CultureInfo.CurrentCulture, OnCultureInfoChanged ) );
-    public CultureInfo CultureInfo
-    {
-      get
-      {
-        return ( CultureInfo )GetValue( CultureInfoProperty );
-      }
-      set
-      {
-        SetValue( CultureInfoProperty, value );
-      }
-    }
-
-    private static void OnCultureInfoChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      InputBase inputBase = o as InputBase;
-      if( inputBase != null )
-        inputBase.OnCultureInfoChanged( ( CultureInfo )e.OldValue, ( CultureInfo )e.NewValue );
-    }
-
-    protected virtual void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
-    {
-
-    }
-
-    #endregion //CultureInfo
-
-    #region IsReadOnly
-
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( InputBase ), new UIPropertyMetadata( false, OnReadOnlyChanged ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-
-    private static void OnReadOnlyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      InputBase inputBase = o as InputBase;
-      if( inputBase != null )
-        inputBase.OnReadOnlyChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnReadOnlyChanged( bool oldValue, bool newValue )
-    {
-    }
-
-    #endregion //IsReadOnly
-
-    #region IsUndoEnabled
-
-    public static readonly DependencyProperty IsUndoEnabledProperty = DependencyProperty.Register( "IsUndoEnabled", typeof( bool ), typeof( InputBase ), new UIPropertyMetadata( true, OnIsUndoEnabledChanged ) );
-    public bool IsUndoEnabled
-    {
-      get
-      {
-        return ( bool )GetValue( IsUndoEnabledProperty );
-      }
-      set
-      {
-        SetValue( IsUndoEnabledProperty, value );
-      }
-    }
-
-    private static void OnIsUndoEnabledChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      InputBase inputBase = o as InputBase;
-      if( inputBase != null )
-        inputBase.OnIsUndoEnabledChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsUndoEnabledChanged( bool oldValue, bool newValue )
-    {
-    }
-
-    #endregion //IsUndoEnabled
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( InputBase ), new FrameworkPropertyMetadata( default( String ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextChanged, null, false, UpdateSourceTrigger.LostFocus ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      InputBase inputBase = o as InputBase;
-      if( inputBase != null )
-        inputBase.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnTextChanged( string oldValue, string newValue )
-    {
-
-    }
-
-    #endregion //Text
-
-    #region TextAlignment
-
-    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( InputBase ), new UIPropertyMetadata( TextAlignment.Left ) );
-    public TextAlignment TextAlignment
-    {
-      get
-      {
-        return ( TextAlignment )GetValue( TextAlignmentProperty );
-      }
-      set
-      {
-        SetValue( TextAlignmentProperty, value );
-      }
-    }
-
-
-    #endregion //TextAlignment
-
-    #region Watermark
-
-    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( InputBase ), new UIPropertyMetadata( null ) );
-    public object Watermark
-    {
-      get
-      {
-        return ( object )GetValue( WatermarkProperty );
-      }
-      set
-      {
-        SetValue( WatermarkProperty, value );
-      }
-    }
-
-    #endregion //Watermark
-
-    #region WatermarkTemplate
-
-    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( InputBase ), new UIPropertyMetadata( null ) );
-    public DataTemplate WatermarkTemplate
-    {
-      get
-      {
-        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
-      }
-      set
-      {
-        SetValue( WatermarkTemplateProperty, value );
-      }
-    }
-
-    #endregion //WatermarkTemplate
-
-    #endregion //Properties
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
deleted file mode 100644
index 1e122a0c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  /// <summary>
-  /// Specify when the mouse wheel is active.
-  /// </summary>
-  public enum MouseWheelActiveTrigger
-  {
-    Focused,
-    FocusedMouseOver,
-    MouseOver,
-    Disabled
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
deleted file mode 100644
index fe383baf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Collections.Specialized;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  [TemplatePart( Name = PART_SelectAllSelectorItem, Type = typeof( SelectAllSelectorItem ) )]
-  public class SelectAllSelector : Selector
-  {
-    private const string PART_SelectAllSelectorItem = "PART_SelectAllSelectorItem";
-
-    #region Members
-
-    private SelectAllSelectorItem _selectAllSelecotrItem;
-
-    #endregion
-
-    #region Properties
-
-    #region IsSelectAllActive
-
-    public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register( "IsSelectAllActive", typeof( bool ), typeof( SelectAllSelector ), new UIPropertyMetadata( false, OnIsSelectAllActiveChanged ) );
-    public bool IsSelectAllActive
-    {
-      get
-      {
-        return ( bool )GetValue( IsSelectAllActiveProperty );
-      }
-      set
-      {
-        SetValue( IsSelectAllActiveProperty, value );
-      }
-    }
-
-    private static void OnIsSelectAllActiveChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var selector = o as SelectAllSelector;
-      if( selector != null )
-        selector.OnIsSelectAllActiveChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsSelectAllActiveChanged( bool oldValue, bool newValue )
-    {
-      if( newValue && ( this.Items.Count > 0 ) )
-      {
-        this.UpdateSelectAllSelectorItem();
-      }
-    }
-
-    #endregion //IsSelectAllActive
-
-    #region SelectAllContent
-
-    public static readonly DependencyProperty SelectAllContentProperty = DependencyProperty.Register( "SelectAllContent", typeof( object ), typeof( SelectAllSelector ), new UIPropertyMetadata( "Select All" ) );
-    public object SelectAllContent
-    {
-      get
-      {
-        return ( object )GetValue( SelectAllContentProperty );
-      }
-      set
-      {
-        SetValue( SelectAllContentProperty, value );
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    protected override void OnSelectedItemsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      base.OnSelectedItemsCollectionChanged( sender, e );
-
-      this.UpdateSelectAllSelectorItem();
-    }
-
-    protected override void OnItemsChanged( NotifyCollectionChangedEventArgs e )
-    {
-      base.OnItemsChanged( e );
-
-      this.UpdateSelectAllSelectorItem();
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      _selectAllSelecotrItem = this.GetTemplateChild( PART_SelectAllSelectorItem ) as SelectAllSelectorItem;
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    public void SelectAll()
-    {
-      foreach( var item in this.ItemsCollection )
-      {
-        if( !this.SelectedItems.Contains( item ) )
-        {
-          this.SelectedItems.Add( item );
-        }
-      }
-    }
-
-    public void UnSelectAll()
-    {
-      this.SelectedItems.Clear();
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void UpdateSelectAllSelectorItem()
-    {
-      if( _selectAllSelecotrItem != null )
-      {
-        // All items are selected; select the SelectAll option.
-        if( this.Items.Count == this.SelectedItems.Count )
-        {
-          _selectAllSelecotrItem.ModifyCurrentSelection( true );
-        }
-        // Some items are selected; set the SelectAll option to null.
-        else if( this.SelectedItems.Count > 0 )
-        {
-          _selectAllSelecotrItem.ModifyCurrentSelection( null );
-        }
-        // No items are selected; unselect the SelectAll option.
-        else
-        {
-          _selectAllSelecotrItem.ModifyCurrentSelection( false );
-        }
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
deleted file mode 100644
index 9f38410a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public class SelectAllSelectorItem : SelectorItem
-  {
-    #region Members
-
-    private bool _ignoreSelectorChanges = false;
-
-    #endregion
-
-    #region Overrides
-
-    // Do not raise an event when this item is Selected/UnSelected.
-    protected override void OnIsSelectedChanged( bool? oldValue, bool? newValue )
-    {
-      if( _ignoreSelectorChanges )
-        return;
-
-      var templatedParent = this.TemplatedParent as SelectAllSelector;
-      if( templatedParent != null )
-      {
-        if( newValue.HasValue )
-        {
-          // Select All
-          if( newValue.Value )
-          {
-            templatedParent.SelectAll();
-          }
-          // UnSelect All
-          else
-          {
-            templatedParent.UnSelectAll();
-          }
-        }
-      }
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal void ModifyCurrentSelection( bool? newSelection )
-    {
-      _ignoreSelectorChanges = true;
-      this.IsSelected = newSelection;
-      _ignoreSelectorChanges = false;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
deleted file mode 100644
index 78355b2e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
+++ /dev/null
@@ -1,986 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Reflection;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public class Selector : ItemsControl, IWeakEventListener //should probably make this control an ICommandSource
-  {
-    #region Members
-
-    private bool _surpressItemSelectionChanged;
-    private bool _ignoreSelectedItemChanged;
-    private bool _ignoreSelectedValueChanged;
-    private int _ignoreSelectedItemsCollectionChanged;
-    private int _ignoreSelectedMemberPathValuesChanged;
-    private IList _selectedItems;
-    private IList _removedItems = new ObservableCollection<object>();
-    private object[] _internalSelectedItems;
-
-    private ValueChangeHelper _selectedMemberPathValuesHelper;
-    private ValueChangeHelper _valueMemberPathValuesHelper;
-
-
-
-    #endregion //Members
-
-    #region Constructors
-
-    public Selector()
-    {
-      this.SelectedItems = new ObservableCollection<object>();
-      AddHandler( Selector.SelectedEvent, new RoutedEventHandler( ( s, args ) => this.OnItemSelectionChangedCore( args, false ) ) );
-      AddHandler( Selector.UnSelectedEvent, new RoutedEventHandler( ( s, args ) => this.OnItemSelectionChangedCore( args, true ) ) );
-      _selectedMemberPathValuesHelper = new ValueChangeHelper( this.OnSelectedMemberPathValuesChanged );
-      _valueMemberPathValuesHelper = new ValueChangeHelper( this.OnValueMemberPathValuesChanged );
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( "Command", typeof( ICommand ), typeof( Selector ), new PropertyMetadata( ( ICommand )null ) );
-    [TypeConverter( typeof( CommandConverter ) )]
-    public ICommand Command
-    {
-      get
-      {
-        return ( ICommand )GetValue( CommandProperty );
-      }
-      set
-      {
-        SetValue( CommandProperty, value );
-      }
-    }
-
-    #region Delimiter
-
-    public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register( "Delimiter", typeof( string ), typeof( Selector ), new UIPropertyMetadata( ",", OnDelimiterChanged ) );
-    public string Delimiter
-    {
-      get
-      {
-        return ( string )GetValue( DelimiterProperty );
-      }
-      set
-      {
-        SetValue( DelimiterProperty, value );
-      }
-    }
-
-    private static void OnDelimiterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ( (Selector)o ).OnSelectedItemChanged( (string)e.OldValue, (string)e.NewValue );
-    }
-
-    protected virtual void OnSelectedItemChanged( string oldValue, string newValue )
-    {
-      if( !this.IsInitialized )
-        return;
-
-      this.UpdateSelectedValue();
-    }
-
-    #endregion
-
-    #region SelectedItem property
-
-    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( Selector ), new UIPropertyMetadata( null, OnSelectedItemChanged ) );
-    public object SelectedItem
-    {
-      get
-      {
-        return ( object )GetValue( SelectedItemProperty );
-      }
-      set
-      {
-        SetValue( SelectedItemProperty, value );
-      }
-    }
-
-    private static void OnSelectedItemChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      ( ( Selector )sender ).OnSelectedItemChanged( args.OldValue, args.NewValue );
-    }
-
-    protected virtual void OnSelectedItemChanged( object oldValue, object newValue )
-    {
-      if( !this.IsInitialized || _ignoreSelectedItemChanged )
-        return;
-
-      _ignoreSelectedItemsCollectionChanged++;
-      this.SelectedItems.Clear();
-      if( newValue != null )
-      {
-        this.SelectedItems.Add( newValue );
-      }
-      this.UpdateFromSelectedItems();
-      _ignoreSelectedItemsCollectionChanged--;
-    }
-
-    #endregion
-
-    #region SelectedItems Property
-
-    public IList SelectedItems
-    {
-      get
-      {
-        return _selectedItems;
-      }
-      private set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "value" );
-
-        INotifyCollectionChanged oldCollection = _selectedItems as INotifyCollectionChanged;
-        INotifyCollectionChanged newCollection = value as INotifyCollectionChanged;
-
-        if( oldCollection != null )
-        {
-          CollectionChangedEventManager.RemoveListener( oldCollection, this );
-        }
-
-        if( newCollection != null )
-        {
-          CollectionChangedEventManager.AddListener( newCollection, this );
-        }
-
-        var newValue = value;
-        var oldValue = _selectedItems;
-        if( oldValue != null )
-        {
-          foreach( var item in oldValue )
-          {
-            if( ( ( newValue != null ) && !newValue.Contains( item ) ) || ( newValue == null ) )
-            {
-              this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, false ) );
-
-              if( Command != null )
-              {
-                this.Command.Execute( item );
-              }
-            }
-          }
-        }
-        if( newValue != null )
-        {
-          foreach( var item in newValue )
-          {
-            this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, true ) );
-
-            if( ( ( oldValue != null ) && !oldValue.Contains( item ) ) || ( oldValue == null ) )
-            {
-              if( Command != null )
-              {
-                this.Command.Execute( item );
-              }
-            }
-          }
-        }
-
-
-        _selectedItems = value;
-      }
-    }
-
-    #endregion SelectedItems
-
-
-    #region SelectedItemsOverride property
-
-    public static readonly DependencyProperty SelectedItemsOverrideProperty = DependencyProperty.Register( "SelectedItemsOverride", typeof( IList ), typeof( Selector ), new UIPropertyMetadata( null, SelectedItemsOverrideChanged ) );
-    public IList SelectedItemsOverride
-    {
-      get
-      {
-        return ( IList )GetValue( SelectedItemsOverrideProperty );
-      }
-      set
-      {
-        SetValue( SelectedItemsOverrideProperty, value );
-      }
-    }
-
-    private static void SelectedItemsOverrideChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      ( ( Selector )sender ).OnSelectedItemsOverrideChanged( ( IList )args.OldValue, ( IList )args.NewValue );
-    }
-
-    protected virtual void OnSelectedItemsOverrideChanged( IList oldValue, IList newValue )
-    {
-      if( !this.IsInitialized )
-        return;
-
-      this.SelectedItems = ( newValue != null ) ? newValue : new ObservableCollection<object>();
-      this.UpdateFromSelectedItems();
-    }
-
-    #endregion
-
-
-    #region SelectedMemberPath Property
-
-    public static readonly DependencyProperty SelectedMemberPathProperty = DependencyProperty.Register( "SelectedMemberPath", typeof( string ), typeof( Selector ), new UIPropertyMetadata( null, OnSelectedMemberPathChanged ) );
-    public string SelectedMemberPath
-    {
-      get
-      {
-        return ( string )GetValue( SelectedMemberPathProperty );
-      }
-      set
-      {
-        SetValue( SelectedMemberPathProperty, value );
-      }
-    }
-
-    private static void OnSelectedMemberPathChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Selector sel = ( ( Selector )o );
-      sel.OnSelectedMemberPathChanged( (string)e.OldValue, (string)e.NewValue );
-    }
-
-    protected virtual void OnSelectedMemberPathChanged( string oldValue, string newValue )
-    {
-      if( !this.IsInitialized )
-        return;
-
-      this.UpdateSelectedMemberPathValuesBindings();
-    }
-
-    #endregion //SelectedMemberPath
-
-    #region SelectedValue
-
-    public static readonly DependencyProperty SelectedValueProperty = DependencyProperty.Register( "SelectedValue", typeof( string ), typeof( Selector ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedValueChanged ) );
-    public string SelectedValue
-    {
-      get
-      {
-        return ( string )GetValue( SelectedValueProperty );
-      }
-      set
-      {
-        SetValue( SelectedValueProperty, value );
-      }
-    }
-
-    private static void OnSelectedValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Selector selector = o as Selector;
-      if( selector != null )
-        selector.OnSelectedValueChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnSelectedValueChanged( string oldValue, string newValue )
-    {
-      if( !this.IsInitialized || _ignoreSelectedValueChanged )
-        return;
-
-      UpdateFromSelectedValue();
-    }
-
-    #endregion //SelectedValue
-
-    #region ValueMemberPath
-
-    public static readonly DependencyProperty ValueMemberPathProperty = DependencyProperty.Register( "ValueMemberPath", typeof( string ), typeof( Selector ), new UIPropertyMetadata( OnValueMemberPathChanged ) );
-    public string ValueMemberPath
-    {
-      get
-      {
-        return ( string )GetValue( ValueMemberPathProperty );
-      }
-      set
-      {
-        SetValue( ValueMemberPathProperty, value );
-      }
-    }
-
-    private static void OnValueMemberPathChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Selector sel = ( ( Selector )o );
-      sel.OnValueMemberPathChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnValueMemberPathChanged( string oldValue, string newValue )
-    {
-      if( !this.IsInitialized )
-        return;
-
-      this.UpdateValueMemberPathValuesBindings();
-    }
-
-    #endregion
-
-    #region ItemsCollection Property
-
-    protected IEnumerable ItemsCollection
-    {
-      get
-      {
-        return ItemsSource ?? ( ( IEnumerable )Items ?? ( IEnumerable )new object[ 0 ] );
-      }
-    }
-
-    #endregion
-
-    #endregion //Properties
-
-    #region Base Class Overrides
-
-    protected override bool IsItemItsOwnContainerOverride( object item )
-    {
-      return item is SelectorItem;
-    }
-
-    protected override DependencyObject GetContainerForItemOverride()
-    {
-      return new SelectorItem();
-    }
-
-    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
-    {
-      base.PrepareContainerForItemOverride( element, item );
-
-      _surpressItemSelectionChanged = true;
-      var selectorItem = element as FrameworkElement;
-
-      selectorItem.SetValue( SelectorItem.IsSelectedProperty, SelectedItems.Contains(item) );
-
-      _surpressItemSelectionChanged = false;
-    }
-
-    protected override void OnItemsSourceChanged( IEnumerable oldValue, IEnumerable newValue )
-    {
-      base.OnItemsSourceChanged( oldValue, newValue );
-
-      var oldCollection = oldValue as INotifyCollectionChanged;
-      var newCollection = newValue as INotifyCollectionChanged;
-
-      if( oldCollection != null )
-      {
-        CollectionChangedEventManager.RemoveListener( oldCollection, this );
-      }
-
-      if( newCollection != null )
-      {
-        CollectionChangedEventManager.AddListener( newCollection, this );
-      }
-
-      if( !this.IsInitialized )
-        return;
-
-      if( !VirtualizingStackPanel.GetIsVirtualizing( this )
-        || (VirtualizingStackPanel.GetIsVirtualizing( this ) && (newValue != null)) )
-      {
-        this.RemoveUnavailableSelectedItems();
-      }
-
-      this.UpdateSelectedMemberPathValuesBindings();
-      this.UpdateValueMemberPathValuesBindings();
-    }
-
-    protected override void OnItemsChanged( NotifyCollectionChangedEventArgs e )
-    {
-      base.OnItemsChanged( e );
-
-      this.RemoveUnavailableSelectedItems();
-    }
-
-    // When a DataTemplate includes a CheckComboBox, some bindings are
-    // not working, like SelectedValue.
-    // We use a priority system to select the good items after initialization.
-    public override void EndInit()
-    {
-      base.EndInit();
-
-      if( this.SelectedItemsOverride != null )
-      {
-        this.OnSelectedItemsOverrideChanged( null, this.SelectedItemsOverride );
-      }
-      else if( this.SelectedMemberPath != null )
-      {
-        this.OnSelectedMemberPathChanged( null, this.SelectedMemberPath );
-      }
-      else if( this.SelectedValue != null )
-      {
-        this.OnSelectedValueChanged( null, this.SelectedValue );
-      }
-      else if( this.SelectedItem != null )
-      {
-        this.OnSelectedItemChanged( null, this.SelectedItem );
-      }
-
-      if( this.ValueMemberPath != null )
-      {
-        this.OnValueMemberPathChanged( null, this.ValueMemberPath );
-      }
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Events
-
-    public static readonly RoutedEvent SelectedEvent = EventManager.RegisterRoutedEvent( "SelectedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Selector ) );
-    public static readonly RoutedEvent UnSelectedEvent = EventManager.RegisterRoutedEvent( "UnSelectedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Selector ) );
-
-    public static readonly RoutedEvent ItemSelectionChangedEvent = EventManager.RegisterRoutedEvent( "ItemSelectionChanged", RoutingStrategy.Bubble, typeof( ItemSelectionChangedEventHandler ), typeof( Selector ) );
-    public event ItemSelectionChangedEventHandler ItemSelectionChanged
-    {
-      add
-      {
-        AddHandler( ItemSelectionChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemSelectionChangedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Methods
-
-    protected object GetPathValue( object item, string propertyPath )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      if( String.IsNullOrEmpty( propertyPath )
-        || propertyPath == "." )
-        return item;
-
-
-      PropertyInfo prop = item.GetType().GetProperty( propertyPath );
-      return ( prop != null )
-        ? prop.GetValue( item, null )
-        : null;
-    }
-
-    protected object GetItemValue( object item )
-    {
-      return ( item != null )
-        ? this.GetPathValue( item, this.ValueMemberPath )
-        : null;
-    }
-
-    protected object ResolveItemByValue( string value )
-    {
-      if( !String.IsNullOrEmpty( ValueMemberPath ) )
-      {
-        foreach( object item in ItemsCollection )
-        {
-          var property = item.GetType().GetProperty( ValueMemberPath );
-          if( property != null )
-          {
-            var propertyValue = property.GetValue( item, null );
-            if( value.Equals( propertyValue.ToString(), StringComparison.InvariantCultureIgnoreCase ) )
-              return item;
-          }
-        }
-      }
-
-      return value;
-    }
-
-    internal void UpdateFromList( List<string> selectedValues, Func<object, object> GetItemfunction )
-    {
-      _ignoreSelectedItemsCollectionChanged++;
-      // Just update the SelectedItems collection content 
-      // and let the synchronization be made from UpdateFromSelectedItems();
-      SelectedItems.Clear();
-
-      if( (selectedValues != null) && (selectedValues.Count > 0) )
-      {
-        ValueEqualityComparer comparer = new ValueEqualityComparer();
-
-        foreach( object item in ItemsCollection )
-        {
-          object itemValue = GetItemfunction( item );
-
-          bool isSelected = (itemValue != null)
-            && selectedValues.Contains( itemValue.ToString(), comparer );
-
-          if( isSelected )
-          {
-            SelectedItems.Add( item );
-          }
-        }
-      }
-      _ignoreSelectedItemsCollectionChanged--;
-
-      this.UpdateFromSelectedItems();
-    }
-
-    private bool? GetSelectedMemberPathValue( object item )
-    {
-      if( String.IsNullOrEmpty( this.SelectedMemberPath ) )
-        return null;
-      if( item == null )
-        return null;
-
-      string[] nameParts = this.SelectedMemberPath.Split( '.' );
-      if( nameParts.Length == 1 )
-      {
-        var property = item.GetType().GetProperty( this.SelectedMemberPath );
-        if( (property != null) && (property.PropertyType == typeof( bool )) )
-          return property.GetValue( item, null ) as bool?;
-        return null;
-      }
-
-      for( int i = 0; i < nameParts.Count(); ++i )
-      {
-        var type = item.GetType();
-        var info = type.GetProperty( nameParts[ i ] );
-        if( info == null )
-        {
-          return null;
-        }
-
-        if( i == nameParts.Count() - 1 )
-        {
-          if( info.PropertyType == typeof( bool ) )
-            return info.GetValue( item, null ) as bool?;
-        }
-        else
-        {
-          item = info.GetValue( item, null );
-        }
-      }
-      return null;
-    }
-
-    private void SetSelectedMemberPathValue( object item, bool value )
-    {
-      if( String.IsNullOrEmpty( this.SelectedMemberPath ) )
-        return;
-      if( item == null )
-        return;
-
-      string[] nameParts = this.SelectedMemberPath.Split( '.' );
-      if( nameParts.Length == 1 )
-      {
-        var property = item.GetType().GetProperty( this.SelectedMemberPath );
-        if( (property != null) && (property.PropertyType == typeof( bool )) )
-        {
-          property.SetValue( item, value, null );
-        }
-        return;
-      }
-
-      for( int i = 0; i < nameParts.Count(); ++i )
-      {
-        var type = item.GetType();
-        var info = type.GetProperty( nameParts[ i ] );
-        if( info == null )
-          return;
-
-        if( i == nameParts.Count() - 1 )
-        {
-          if( info.PropertyType == typeof( bool ) )
-          {
-            info.SetValue( item, value, null );
-          }
-        }
-        else
-        {
-          item = info.GetValue( item, null );
-        }
-      }
-    }
-
-    /// <summary>
-    /// When SelectedItems collection implements INotifyPropertyChanged, this is the callback.
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected virtual void OnSelectedItemsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( e.Action == NotifyCollectionChangedAction.Reset )
-      {
-        if( _internalSelectedItems != null )
-        {
-          foreach( var item in _internalSelectedItems )
-          {
-            this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, false ) );
-
-            if( Command != null )
-            {
-              this.Command.Execute( item );
-            }
-          }
-        }
-      }
-      if( e.OldItems != null )
-      {
-        foreach( var item in e.OldItems )
-        {
-          this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, false ) );
-
-          if( Command != null )
-          {
-            this.Command.Execute( item );
-          }
-        }
-      }
-      if( e.NewItems != null )
-      {
-        foreach( var item in e.NewItems )
-        {
-          this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, true ) );
-
-          if( Command != null )
-          {
-            this.Command.Execute( item );
-          }
-        }
-      }
-
-      if( _ignoreSelectedItemsCollectionChanged > 0 )
-        return;
-
-      // Keep it simple for now. Just update all
-      this.UpdateFromSelectedItems();
-    }
-
-    private void OnItemSelectionChangedCore( RoutedEventArgs args, bool unselected )
-    {
-      object item = this.ItemContainerGenerator.ItemFromContainer( ( DependencyObject )args.OriginalSource );
-
-      // When the item is it's own container, "UnsetValue" will be returned.
-      if( item == DependencyProperty.UnsetValue )
-      {
-        item = args.OriginalSource;
-      }
-
-      if( unselected )
-      {
-        while( SelectedItems.Contains( item ) )
-          SelectedItems.Remove( item );
-      }
-      else
-      {
-        if( !SelectedItems.Contains( item ) )
-          SelectedItems.Add( item );
-      }
-    }
-
-    /// <summary>
-    /// When the ItemsSource implements INotifyPropertyChanged, this is the change callback.
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="args"></param>
-    private void OnItemsSourceCollectionChanged( object sender, NotifyCollectionChangedEventArgs args )
-    {
-      this.RemoveUnavailableSelectedItems();
-      this.AddAvailableRemovedItems();
-      this.UpdateSelectedMemberPathValuesBindings();
-      this.UpdateValueMemberPathValuesBindings();
-    }
-
-    /// <summary>
-    /// This is called when any value of any item referenced by SelectedMemberPath
-    /// is modified. This may affect the SelectedItems collection.
-    /// </summary>
-    private void OnSelectedMemberPathValuesChanged()
-    {
-      if( _ignoreSelectedMemberPathValuesChanged > 0 )
-        return;
-
-      this.UpdateFromSelectedMemberPathValues();
-    }
-
-    /// <summary>
-    /// This is called when any value of any item referenced by ValueMemberPath
-    /// is modified. This will affect the SelectedValue property
-    /// </summary>
-    private void OnValueMemberPathValuesChanged()
-    {
-      this.UpdateSelectedValue();
-    }
-
-    private void UpdateSelectedMemberPathValuesBindings()
-    {
-      _selectedMemberPathValuesHelper.UpdateValueSource( ItemsCollection, SelectedMemberPath );
-      this.UpdateFromSelectedMemberPathValues();
-    }
-
-    private void UpdateValueMemberPathValuesBindings()
-    {
-      _valueMemberPathValuesHelper.UpdateValueSource( ItemsCollection, ValueMemberPath );
-    }
-
-    /// <summary>
-    /// This method will be called when the "IsSelected" property of an SelectorItem
-    /// has been modified.
-    /// </summary>
-    /// <param name="args"></param>
-    protected virtual void OnItemSelectionChanged( ItemSelectionChangedEventArgs args )
-    {
-      if( _surpressItemSelectionChanged )
-        return;
-
-      RaiseEvent( args );
-    }
-
-    /// <summary>
-    /// Updates the SelectedValue property based on what is present in the SelectedItems property.
-    /// </summary>
-    private void UpdateSelectedValue()
-    {
-#if VS2008
-      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemValue( x ).ToString() ).ToArray() );
-#else
-      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemValue( x ) ) );
-#endif
-      if( String.IsNullOrEmpty( SelectedValue ) || !SelectedValue.Equals( newValue ) )
-      {
-        _ignoreSelectedValueChanged = true;
-        SelectedValue = newValue;
-        _ignoreSelectedValueChanged = false;
-      }
-    }
-
-    /// <summary>
-    /// Updates the SelectedItem property based on what is present in the SelectedItems property.
-    /// </summary>
-    private void UpdateSelectedItem()
-    {
-      if( !SelectedItems.Contains( SelectedItem ) )
-      {
-        _ignoreSelectedItemChanged = true;
-        SelectedItem = ( SelectedItems.Count > 0 ) ? SelectedItems[ 0 ] : null;
-        _ignoreSelectedItemChanged = false;
-      }
-    }
-
-    /// <summary>
-    /// Update the SelectedItems collection based on the values 
-    /// refered to by the SelectedMemberPath property.
-    /// </summary>
-    private void UpdateFromSelectedMemberPathValues()
-    {
-      _ignoreSelectedItemsCollectionChanged++;
-      foreach( var item in ItemsCollection )
-      {
-        bool? isSelected = this.GetSelectedMemberPathValue( item );
-        if( isSelected != null )
-        {
-          if( isSelected.Value )
-          {
-            if( !SelectedItems.Contains( item ) )
-            {
-              SelectedItems.Add( item );
-            }
-          }
-          else
-          {
-            if( SelectedItems.Contains( item ) )
-            {
-              SelectedItems.Remove( item );
-            }
-          }
-        }
-      }
-      _ignoreSelectedItemsCollectionChanged--;
-      this.UpdateFromSelectedItems();
-    }
-
-    internal void UpdateSelectedItems( IList selectedItems )
-    {
-      if( selectedItems == null )
-        throw new ArgumentNullException( "selectedItems" );
-
-      // Just check if the collection is the same..
-      if( selectedItems.Count == this.SelectedItems.Count
-        && selectedItems.Cast<object>().SequenceEqual( this.SelectedItems.Cast<object>() ) )
-        return;
-
-      _ignoreSelectedItemsCollectionChanged++;
-      this.SelectedItems.Clear();
-      foreach( object newItem in selectedItems )
-      {
-        this.SelectedItems.Add( newItem );
-      }
-      _ignoreSelectedItemsCollectionChanged--;
-      this.UpdateFromSelectedItems();
-    }
-
-    /// <summary>
-    /// Updates the following based on the content of SelectedItems:
-    /// - All SelectorItems "IsSelected" properties
-    /// - Values refered to by SelectedMemberPath
-    /// - SelectedItem property
-    /// - SelectedValue property
-    /// Refered to by the SelectedMemberPath property.
-    /// </summary>
-    private void UpdateFromSelectedItems()
-    {
-      foreach( object o in ItemsCollection )
-      {
-        bool isSelected = SelectedItems.Contains( o );
-
-        _ignoreSelectedMemberPathValuesChanged++;
-        this.SetSelectedMemberPathValue(o, isSelected);
-        _ignoreSelectedMemberPathValuesChanged--;
-
-        var selectorItem = ItemContainerGenerator.ContainerFromItem( o ) as SelectorItem;
-        if( selectorItem != null )
-        {
-          selectorItem.IsSelected = isSelected;
-        }
-      }
-
-      UpdateSelectedItem();
-      UpdateSelectedValue();
-
-      _internalSelectedItems = new object[ this.SelectedItems.Count ];
-      this.SelectedItems.CopyTo( _internalSelectedItems, 0 );
-    }
-
-    /// <summary>
-    /// Removes all items from SelectedItems that are no longer in ItemsSource.
-    /// </summary>
-    private void RemoveUnavailableSelectedItems()
-    {
-      _ignoreSelectedItemsCollectionChanged++;
-      HashSet<object> hash = new HashSet<object>( ItemsCollection.Cast<object>() );
-
-      for( int i = 0; i < SelectedItems.Count; i++ )
-      {
-        if( !hash.Contains( SelectedItems[ i ] ) )
-        {
-          _removedItems.Add( SelectedItems[ i ] );
-          SelectedItems.RemoveAt( i );
-          i--;
-        }
-      }
-      _ignoreSelectedItemsCollectionChanged--;
-
-      UpdateSelectedItem();
-      UpdateSelectedValue();
-    }
-
-    private void AddAvailableRemovedItems()
-    {
-      HashSet<object> hash = new HashSet<object>( ItemsCollection.Cast<object>() );
-
-      for( int i = 0; i < _removedItems.Count; i++ )
-      {
-        if( hash.Contains( _removedItems[ i ] ) )
-        {
-          SelectedItems.Add( _removedItems[ i ] );
-          _removedItems.RemoveAt( i );          
-          i--;
-        }
-      }
-    }
-
-    /// <summary>
-    /// Updates the SelectedItems collection based on the content of
-    /// the SelectedValue property.
-    /// </summary>
-    private void UpdateFromSelectedValue()
-    {
-      List<string> selectedValues = null;
-      if( !String.IsNullOrEmpty( SelectedValue ) )
-      {
-        selectedValues = SelectedValue.Split( new string[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries ).ToList();
-      }
-
-      this.UpdateFromList( selectedValues, this.GetItemValue );
-    }
-
-    #endregion //Methods
-
-    #region IWeakEventListener Members
-
-    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        if( object.ReferenceEquals( _selectedItems, sender ) )
-        {
-          this.OnSelectedItemsCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-          return true;
-        }
-        else if( object.ReferenceEquals( ItemsCollection, sender ) )
-        {
-          this.OnItemsSourceCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    #endregion
-
-    #region ValueEqualityComparer private class
-
-    private class ValueEqualityComparer : IEqualityComparer<string>
-    {
-      public bool Equals( string x, string y )
-      {
-        return string.Equals( x, y, StringComparison.InvariantCultureIgnoreCase );
-      }
-
-      public int GetHashCode( string obj )
-      {
-        return 1;
-      }
-    }
-
-    #endregion
-  }
-
-
-  public delegate void ItemSelectionChangedEventHandler( object sender, ItemSelectionChangedEventArgs e );
-  public class ItemSelectionChangedEventArgs : RoutedEventArgs
-  {
-    public bool IsSelected
-    {
-      get;
-      private set;
-    }
-    public object Item
-    {
-      get;
-      private set;
-    }
-
-    public ItemSelectionChangedEventArgs( RoutedEvent routedEvent, object source, object item, bool isSelected )
-      : base( routedEvent, source )
-    {
-      Item = item;
-      IsSelected = isSelected;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
deleted file mode 100644
index 85c0ced8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public class SelectorItem : ContentControl
-  {
-    #region Constructors
-
-    static SelectorItem()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( SelectorItem ), new FrameworkPropertyMetadata( typeof( SelectorItem ) ) );
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool? ), typeof( SelectorItem ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
-    public bool? IsSelected
-    {
-      get
-      {
-        return ( bool? )GetValue( IsSelectedProperty );
-      }
-      set
-      {
-        SetValue( IsSelectedProperty, value );
-      }
-    }
-
-    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      SelectorItem selectorItem = o as SelectorItem;
-      if( selectorItem != null )
-        selectorItem.OnIsSelectedChanged( ( bool? )e.OldValue, ( bool? )e.NewValue );
-    }
-
-    protected virtual void OnIsSelectedChanged( bool? oldValue, bool? newValue )
-    {
-      if( newValue.HasValue )
-      {
-        if( newValue.Value )
-        {
-          this.RaiseEvent( new RoutedEventArgs( Selector.SelectedEvent, this ) );
-        }
-        else
-        {
-          this.RaiseEvent( new RoutedEventArgs( Selector.UnSelectedEvent, this ) );
-        }
-      }
-    }
-
-    internal Selector ParentSelector
-    {
-      get
-      {
-        return ItemsControl.ItemsControlFromItemContainer( this ) as Selector;
-      }
-    }
-
-    #endregion //Properties
-
-    #region Events
-
-    public static readonly RoutedEvent SelectedEvent = Selector.SelectedEvent.AddOwner( typeof( SelectorItem ) );
-    public static readonly RoutedEvent UnselectedEvent = Selector.UnSelectedEvent.AddOwner( typeof( SelectorItem ) );
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
deleted file mode 100644
index ccddcb5e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public abstract class ShapeBase : Shape
-  {
-    #region Constructors
-
-    static ShapeBase()
-    {
-      ShapeBase.StrokeDashArrayProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeDashCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeDashOffsetProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeEndLineCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeLineJoinProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeMiterLimitProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeStartLineCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeThicknessProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-    }
-
-    #endregion
-
-    #region IsPenEmptyOrUndefined Internal Property
-
-    internal bool IsPenEmptyOrUndefined
-    {
-      get
-      {
-        double strokeThickness = this.StrokeThickness;
-        return ( this.Stroke == null ) || DoubleHelper.IsNaN( strokeThickness ) || DoubleHelper.AreVirtuallyEqual( 0, strokeThickness );
-      }
-    }
-
-    #endregion
-
-    #region DefiningGeometry Protected Property
-
-    protected abstract override Geometry DefiningGeometry
-    {
-      get;
-    }
-
-    #endregion
-
-    internal virtual Rect GetDefiningGeometryBounds()
-    {
-      Geometry geometry = this.DefiningGeometry;
-
-      Debug.Assert( geometry != null );
-
-      return geometry.Bounds;
-    }
-
-    internal virtual Size GetNaturalSize()
-    {
-      Geometry geometry = this.DefiningGeometry;
-
-      Debug.Assert( geometry != null );
-
-      Rect bounds = geometry.GetRenderBounds( GetPen() );
-
-      return new Size( Math.Max( bounds.Right, 0 ), Math.Max( bounds.Bottom, 0 ) );
-    }
-
-    internal Pen GetPen()
-    {
-      if( this.IsPenEmptyOrUndefined )
-        return null;
-
-      if( _pen == null )
-      {
-        _pen = this.MakePen();
-      }
-
-      return _pen;
-    }
-
-    internal double GetStrokeThickness()
-    {
-      if( this.IsPenEmptyOrUndefined )
-        return 0d;
-
-      return Math.Abs( this.StrokeThickness );
-    }
-
-    internal bool IsSizeEmptyOrUndefined( Size size )
-    {
-      return ( DoubleHelper.IsNaN( size.Width ) || DoubleHelper.IsNaN( size.Height ) || size.IsEmpty );
-    }
-
-    private static void OnStrokeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( ShapeBase )d )._pen = null;
-    }
-
-    private Pen MakePen()
-    {
-      Pen pen = new Pen();
-      pen.Brush = this.Stroke;
-      pen.DashCap = this.StrokeDashCap;
-      if( this.StrokeDashArray != null || this.StrokeDashOffset != 0.0 )
-      {
-        pen.DashStyle = new DashStyle( this.StrokeDashArray, this.StrokeDashOffset );
-      }
-      pen.EndLineCap = this.StrokeEndLineCap;
-      pen.LineJoin = this.StrokeLineJoin;
-      pen.MiterLimit = this.StrokeMiterLimit;
-      pen.StartLineCap = this.StrokeStartLineCap;
-      pen.Thickness = Math.Abs( this.StrokeThickness );
-
-      return pen;
-    }
-
-    #region Private Fields
-
-    private Pen _pen = null;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
deleted file mode 100644
index ecfdaddf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
-
-   <!-- =============================================================================== -->
-   <!-- SelectorItem                                                                    -->
-   <!-- =============================================================================== -->
-
-   <Style TargetType="{x:Type primitives:SelectorItem}">
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="Padding"
-              Value="4,0,0,0" />
-      <Setter Property="IsTabStop" Value="False" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
-               <Border x:Name="_background" 
-                            Background="{TemplateBinding Background}" 
-                            BorderBrush="{TemplateBinding BorderBrush}" 
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                  <!-- In Classic Theme, The Foreground shouldn't be applied to Checkmark and Text-->
-                  <CheckBox IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                     <CheckBox.Content>
-                        <ContentControl Content="{TemplateBinding Content}"
-                                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        Foreground="{TemplateBinding Foreground}" />
-                     </CheckBox.Content>
-                  </CheckBox>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter TargetName="_background" Property="Background" Value="#FFB8E0F3" />
-                     <Setter TargetName="_background" Property="BorderBrush" Value="#FF26A0DA" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
deleted file mode 100644
index eaf040a4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
+++ /dev/null
@@ -1,395 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:core="clr-namespace:Xceed.Wpf.Toolkit.Core"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../../Themes/Aero2/Common.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <sys:Double x:Key="TopBorderThumbHeight">5</sys:Double>
-
-  <conv:WindowContentBorderMarginConverter x:Key="WindowContentBorderMarginConverter" />
-  <conv:WindowControlBackgroundConverter x:Key="WindowControlBackgroundConverter" />
-
-  <conv:CenterTitleConverter x:Key="CenterTitleConverter" />
-
-  <!-- =============================================================================== -->
-  <!-- WindowControl                                                                    -->
-  <!-- =============================================================================== -->
-
-  <ControlTemplate x:Key="WindowControlTemplate"
-                   TargetType="{x:Type local:WindowControl}">
-    <Grid>
-      <Border x:Name="PART_WindowRoot"
-              BorderThickness="{TemplateBinding WindowBorderThickness}"
-              BorderBrush="{TemplateBinding WindowBorderBrush}"
-              CornerRadius="0"
-              Width="{TemplateBinding Width}"
-              Height="{TemplateBinding Height}">
-        <Border.Background>
-          <MultiBinding Converter="{StaticResource WindowControlBackgroundConverter}">
-            <Binding Path="WindowBackground"
-                     RelativeSource="{RelativeSource TemplatedParent}" />
-            <Binding Path="WindowOpacity"
-                     RelativeSource="{RelativeSource TemplatedParent}" />
-          </MultiBinding>
-        </Border.Background>
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition />
-          </Grid.RowDefinitions>
-
-          <!-- Header Grid-->
-          <Grid x:Name="PART_HeaderGrid">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="{Binding WindowThickness.Left, RelativeSource={RelativeSource TemplatedParent}}" />
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition x:Name="HeaderButtonsColumn"
-                                Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition x:Name="HeaderRow"
-                             MinHeight="28" />
-              <RowDefinition Height="{Binding WindowThickness.Top, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Grid.RowDefinitions>
-
-            <!-- Icon and Title -->
-            <Image x:Name="PART_Icon"
-                   Grid.Row="0"
-                   Grid.RowSpan="2"
-                   Grid.Column="1"
-                   VerticalAlignment="Center"
-                   Source="{TemplateBinding CaptionIcon}"
-                   MaxWidth="15"
-                   MaxHeight="15"
-                   Margin="0,2,0,2">
-            </Image>
-            <Grid x:Name="Title"
-                  Grid.Column="2"
-                  Grid.Row="0"
-                  Grid.RowSpan="2">
-              <!-- Rectangle behind title to display a glow effect on title -->
-              <Rectangle Width="{Binding ElementName=TitleGrid, Path=ActualWidth}"
-                         Height="{Binding ElementName=TitleGrid, Path=ActualHeight}"
-                         HorizontalAlignment="{Binding ElementName=TitleGrid, Path=HorizontalAlignment}"
-                         VerticalAlignment="{Binding ElementName=TitleGrid, Path=VerticalAlignment}"
-                         Fill="{TemplateBinding CaptionShadowBrush}">
-                <Rectangle.Effect>
-                  <BlurEffect Radius="10" />
-                </Rectangle.Effect>
-              </Rectangle>
-              <Grid x:Name="TitleGrid"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center">
-                <TextBlock x:Name="TitleText"
-                           FontSize="{TemplateBinding CaptionFontSize}"
-                           Text="{TemplateBinding Caption}"
-                           Foreground="{TemplateBinding CaptionForeground}"
-                           TextTrimming="CharacterEllipsis"
-                           Margin="5,0,5,0" />
-              </Grid>
-            </Grid>
-
-            <!-- Close-Maximize-Minimize Buttons -->
-            <StackPanel x:Name="ButtonsPanel"
-                        Grid.Row="0"
-                        Grid.RowSpan="2"
-                        Grid.Column="3"
-                        Orientation="Horizontal"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Right">
-              <StackPanel.Margin>
-                <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}"
-                              ConverterParameter="2">
-                  <Binding Path="WindowThickness.Right"
-                           RelativeSource="{RelativeSource TemplatedParent}" />
-                  <Binding Path="WindowThickness.Right"
-                           RelativeSource="{RelativeSource TemplatedParent}" />
-                  <!-- not used -->
-                </MultiBinding>
-              </StackPanel.Margin>
-
-
-
-              <!--close button-->
-              <Border Margin="1,0,0,0">
-                <Button x:Name="PART_CloseButton"
-                        SnapsToDevicePixels="False"
-                        Style="{TemplateBinding CloseButtonStyle}"
-                        ToolTip="Close"
-                        Visibility="{TemplateBinding CloseButtonVisibility}"
-                        Height="20"
-                        Width="45"
-                        IsTabStop="False">
-                  <Path Height="9"
-                        RenderOptions.EdgeMode="Aliased"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Width="9"
-                        Fill="White"
-                        Stretch="None"
-                        Stroke="Transparent"
-                        Data="{StaticResource closeGeometry}">
-                    <Path.RenderTransform>
-                      <TranslateTransform X="1"
-                                          Y="1" />
-                    </Path.RenderTransform>
-                  </Path>
-                </Button>
-              </Border>
-            </StackPanel>
-
-            <!-- ToolWindow Close Button -->
-            <Border x:Name="ToolWindowBorder"
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    Grid.Column="3"
-                    VerticalAlignment="Top"
-                    Visibility="Collapsed"
-                    HorizontalAlignment="Right">
-              <Border.Margin>
-                <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}"
-                              ConverterParameter="2">
-                  <Binding Path="WindowThickness.Right"
-                           RelativeSource="{RelativeSource TemplatedParent}" />
-                  <Binding Path="WindowThickness.Right"
-                           RelativeSource="{RelativeSource TemplatedParent}" />
-                  <!-- not used -->
-                </MultiBinding>
-              </Border.Margin>
-              <Button x:Name="PART_ToolWindowCloseButton"
-                      SnapsToDevicePixels="False"
-                      Style="{TemplateBinding CloseButtonStyle}"
-                      Height="19"
-                      Width="19"
-                      Margin="0,5,0,5"
-                      IsTabStop="False">
-                <Path Height="5"
-                      RenderOptions.EdgeMode="Aliased"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Width="5"
-                      Fill="Transparent"
-                      Stretch="Uniform"
-                      Stroke="White"
-                      Data="{StaticResource toolWindowCloseGeometry}">
-                </Path>
-              </Button>
-            </Border>
-
-            <!-- Header Drag Thumb -->
-            <Thumb x:Name="PART_HeaderThumb"
-                   Grid.Row="0"
-                   Grid.RowSpan="2"
-                   Grid.Column="2"
-                   Opacity="0"
-                   IsTabStop="False">
-            </Thumb>
-          </Grid>
-
-          <!-- Content Border -->
-          <Border x:Name="ContentOuterBorder"
-                  Grid.Row="1">
-            <Border.Margin>
-              <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}"
-                            ConverterParameter="0">
-                <Binding Path="WindowThickness.Left"
-                         RelativeSource="{RelativeSource TemplatedParent}" />
-                <Binding Path="WindowThickness.Bottom"
-                         RelativeSource="{RelativeSource TemplatedParent}" />
-              </MultiBinding>
-            </Border.Margin>
-            <Border x:Name="ContentBorder"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}">
-              <AdornerDecorator>
-                <ContentPresenter x:Name="Content"
-                                  Content="{TemplateBinding Content}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
-              </AdornerDecorator>
-            </Border>
-          </Border>
-
-
-        </Grid>
-      </Border>
-
-      <!-- Special Border to prevent all mouse inputs when this WindowControl is behind a modal window -->
-      <Border x:Name="PART_BlockMouseInputsBorder"
-              Background="Transparent"
-              Visibility="Collapsed" />
-    </Grid>
-    <ControlTemplate.Triggers>
-
-      <Trigger Property="WindowStyle"
-               Value="None">
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="PART_Icon" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="Title" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="PART_HeaderThumb" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="ButtonsPanel" />
-        <Setter Property="Height"
-                Value="0"
-                TargetName="HeaderRow" />
-      </Trigger>
-
-
-
-      <Trigger Property="WindowStyle"
-               Value="ToolWindow">
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="PART_Icon" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="ButtonsPanel" />
-        <Setter Property="Visibility"
-                Value="Visible"
-                TargetName="ToolWindowBorder" />
-      </Trigger>
-
-      <Trigger Property="IsKeyboardFocusWithin"
-               Value="True">
-        <Setter Property="KeyboardNavigation.TabNavigation"
-                Value="Cycle" />
-      </Trigger>
-
-      <Trigger Property="IsActive"
-               Value="False">
-        <Setter Property="Background"
-                Value="{Binding WindowInactiveBackground, RelativeSource={RelativeSource TemplatedParent}}"
-                TargetName="PART_WindowRoot" />
-        <Setter Property="BorderBrush"
-                Value="#FFD3D3D3"
-                TargetName="PART_WindowRoot" />
-        <Setter Property="BorderBrush"
-                Value="#FFDADADA"
-                TargetName="ContentOuterBorder" />
-        <Setter Property="IsEnabled"
-                Value="False"
-                TargetName="Content" />
-      </Trigger>
-
-      <!-- Remove the Margin when there's no title to remove the TitleShadow glow effect. -->
-      <Trigger Property="Text"
-               Value=""
-               SourceName="TitleText">
-        <Setter Property="Margin"
-                Value="0"
-                TargetName="TitleText" />
-      </Trigger>
-
-      <Trigger Property="Text"
-               Value="{x:Null}"
-               SourceName="TitleText">
-        <Setter Property="Margin"
-                Value="0"
-                TargetName="TitleText" />
-      </Trigger>
-
-      <!-- Center the Window Title on the entire window -->
-      <DataTrigger Value="1">
-        <DataTrigger.Binding>
-          <MultiBinding Converter="{StaticResource CenterTitleConverter}">
-            <Binding ElementName="TitleText"
-                     Path="DesiredSize" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ActualWidth" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ColumnDefinitions" />
-          </MultiBinding>
-        </DataTrigger.Binding>
-        <Setter TargetName="Title"
-                Property="Column"
-                Value="0" />
-        <Setter TargetName="Title"
-                Property="ColumnSpan"
-                Value="4" />
-        <Setter TargetName="TitleGrid"
-                Property="HorizontalAlignment"
-                Value="Center" />
-      </DataTrigger>
-
-      <!-- Center the Window Title in it's own column -->
-      <DataTrigger Value="2">
-        <DataTrigger.Binding>
-          <MultiBinding Converter="{StaticResource CenterTitleConverter}">
-            <Binding ElementName="TitleText"
-                     Path="DesiredSize" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ActualWidth" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ColumnDefinitions" />
-          </MultiBinding>
-        </DataTrigger.Binding>
-        <Setter TargetName="TitleGrid"
-                Property="HorizontalAlignment"
-                Value="Center" />
-      </DataTrigger>
-
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:WindowControl}">
-    <Setter Property="CloseButtonStyle"
-            Value="{StaticResource {ComponentResourceKey 
-                  TypeInTargetAssembly={x:Type local:WindowControl}, 
-                  ResourceId=DefaultCloseButtonStyle}}" />
-    <Setter Property="BorderBrush"
-            Value="#5D6C7A" />
-    <Setter Property="BorderThickness"
-            Value="1,1,1,1" />
-    <Setter Property="Background"
-            Value="{StaticResource Window_Background}" />
-    <Setter Property="CaptionFontSize"
-            Value="{StaticResource Window_CaptionFontSize}" />
-    <Setter Property="CaptionForeground"
-            Value="{StaticResource Window_CaptionForeground}" />
-    <Setter Property="CaptionShadowBrush"
-            Value="{StaticResource Window_CaptionShadowBrush}" />
-    <Setter Property="WindowBorderBrush"
-            Value="{StaticResource Window_WindowBorderBrush}" />
-    <Setter Property="WindowBackground"
-            Value="{StaticResource Window_WindowBackground}" />
-    <Setter Property="WindowBorderThickness"
-            Value="{StaticResource Window_WindowBorderThickness}" />
-    <Setter Property="WindowInactiveBackground"
-            Value="{StaticResource Window_WindowInactiveBackground}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="KeyboardNavigation.TabNavigation"
-            Value="None" />
-    <Setter Property="Template"
-            Value="{StaticResource WindowControlTemplate}" />
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
deleted file mode 100644
index 970e66e3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives" >
-
-   <!-- =============================================================================== -->
-   <!-- SelectorItem                                                                    -->
-   <!-- =============================================================================== -->
-
-   <Style TargetType="{x:Type primitives:SelectorItem}">
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="Padding"
-              Value="4,0,0,0" />
-      <Setter Property="IsTabStop"
-               Value="False" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
-               <Border x:Name="_background"
-                       Background="{TemplateBinding Background}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}">
-                  <!-- In Classic Theme, The Foreground shouldn't be applied to Checkmark and Text-->
-                  <CheckBox IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                     <CheckBox.Content>
-                        <ContentControl Content="{TemplateBinding Content}"
-                                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        Foreground="{TemplateBinding Foreground}" />
-                     </CheckBox.Content>
-                  </CheckBox>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-                  </Trigger>
-                  <Trigger Property="IsKeyboardFocusWithin" Value="true">
-                     <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
deleted file mode 100644
index cb7bd023..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
+++ /dev/null
@@ -1,386 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:core="clr-namespace:Xceed.Wpf.Toolkit.Core"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../../Themes/Generic/Common.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <sys:Double x:Key="TopBorderThumbHeight">5</sys:Double>
-
-  <conv:WindowContentBorderMarginConverter x:Key="WindowContentBorderMarginConverter" />
-  <conv:WindowControlBackgroundConverter x:Key="WindowControlBackgroundConverter" />
-  <BooleanToVisibilityConverter x:Key="booleanToVisibilityConverter" />
-
-  <conv:CenterTitleConverter x:Key="CenterTitleConverter" />
-
-  <!-- =============================================================================== -->
-  <!-- WindowControl                                                                    -->
-  <!-- =============================================================================== -->
-
-  <ControlTemplate x:Key="WindowControlTemplate"
-                   TargetType="{x:Type local:WindowControl}">
-    <Grid>
-      <Border x:Name="PART_WindowRoot"
-              BorderThickness="{TemplateBinding WindowBorderThickness}"
-              BorderBrush="{TemplateBinding WindowBorderBrush}"
-              CornerRadius="6"
-              Width="{TemplateBinding Width}"
-              Height="{TemplateBinding Height}">
-        <Border.Background>
-          <MultiBinding Converter="{StaticResource WindowControlBackgroundConverter}">
-            <Binding Path="WindowBackground"
-                     RelativeSource="{RelativeSource TemplatedParent}" />
-            <Binding Path="WindowOpacity"
-                     RelativeSource="{RelativeSource TemplatedParent}" />
-          </MultiBinding>
-        </Border.Background>
-        <Border x:Name="WindowRootInnerBorder"
-                BorderThickness="1"
-                BorderBrush="White"
-                CornerRadius="6">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition />
-            </Grid.RowDefinitions>
-
-            <!-- Header Grid-->
-            <Grid x:Name="PART_HeaderGrid">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="{Binding WindowThickness.Left, RelativeSource={RelativeSource TemplatedParent}}" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition x:Name="HeaderButtonsColumn"
-                                  Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <Grid.RowDefinitions>
-                <RowDefinition x:Name="HeaderRow"
-                               MinHeight="28" />
-                <RowDefinition Height="{Binding WindowThickness.Top, RelativeSource={RelativeSource TemplatedParent}}" />
-              </Grid.RowDefinitions>
-
-              <!-- Icon and Title -->
-              <Image x:Name="PART_Icon"
-                     Grid.Row="0"
-                     Grid.RowSpan="2"
-                     Grid.Column="1"
-                     VerticalAlignment="Center"
-                     Source="{TemplateBinding CaptionIcon}"
-                     MaxWidth="15"
-                     MaxHeight="15"
-                     Margin="0,2,0,2">
-              </Image>
-              <Grid x:Name="Title"
-                    Grid.Column="2"
-                    Grid.Row="0"
-                    Grid.RowSpan="2">
-                <!-- Rectangle behind title to display a glow effect on title -->
-                <Rectangle Width="{Binding ElementName=TitleGrid, Path=ActualWidth}"
-                           Height="{Binding ElementName=TitleGrid, Path=ActualHeight}"
-                           HorizontalAlignment="{Binding ElementName=TitleGrid, Path=HorizontalAlignment}"
-                           VerticalAlignment="{Binding ElementName=TitleGrid, Path=VerticalAlignment}"
-                           Fill="{TemplateBinding CaptionShadowBrush}">
-                  <Rectangle.Effect>
-                    <BlurEffect Radius="10" />
-                  </Rectangle.Effect>
-                </Rectangle>
-                <Grid x:Name="TitleGrid"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center">
-                  <TextBlock x:Name="TitleText"
-                             FontSize="{TemplateBinding CaptionFontSize}"
-                             Text="{TemplateBinding Caption}"
-                             Foreground="{TemplateBinding CaptionForeground}"
-                             TextTrimming="CharacterEllipsis"
-                             Margin="5,0,5,0" />
-                </Grid>
-              </Grid>
-
-              <!-- Close-Maximize-Minimize Buttons -->
-              <StackPanel x:Name="ButtonsPanel"
-                          Grid.Row="0"
-                          Grid.RowSpan="2"
-                          Grid.Column="3"
-                          Orientation="Horizontal"
-                          VerticalAlignment="Top"
-                          HorizontalAlignment="Right">
-                <StackPanel.Margin>
-                  <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}"
-                                ConverterParameter="2">
-                    <Binding Path="WindowThickness.Right"
-                             RelativeSource="{RelativeSource TemplatedParent}" />
-                    <Binding Path="WindowThickness.Right"
-                             RelativeSource="{RelativeSource TemplatedParent}" />
-                    <!-- not used -->
-                  </MultiBinding>
-                </StackPanel.Margin>
-                <!--close button-->
-                <Button x:Name="PART_CloseButton"
-                        Style="{TemplateBinding CloseButtonStyle}"
-                        Visibility="{TemplateBinding CloseButtonVisibility}">
-                </Button>
-              </StackPanel>
-
-              <!-- ToolWindow Close Button -->
-              <Border x:Name="ToolWindowBorder"
-                      Grid.Row="0"
-                      Grid.RowSpan="2"
-                      Grid.Column="3"
-                      VerticalAlignment="Top"
-                      Visibility="Collapsed"
-                      HorizontalAlignment="Right">
-                <Border.Margin>
-                  <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}"
-                                ConverterParameter="2">
-                    <Binding Path="WindowThickness.Right"
-                             RelativeSource="{RelativeSource TemplatedParent}" />
-                    <Binding Path="WindowThickness.Right"
-                             RelativeSource="{RelativeSource TemplatedParent}" />
-                    <!-- not used -->
-                  </MultiBinding>
-                </Border.Margin>
-                <Button x:Name="PART_ToolWindowCloseButton"
-                        Margin="0,3,0,1"
-                        Style="{TemplateBinding CloseButtonStyle}">
-                </Button>
-              </Border>
-
-              <!-- Header Drag Thumb -->
-              <Thumb x:Name="PART_HeaderThumb"
-                     Grid.Row="0"
-                     Grid.RowSpan="2"
-                     Grid.Column="2"
-                     Opacity="0"
-                     IsTabStop="False">
-              </Thumb>
-            </Grid>
-
-            <!-- Content Border -->
-            <Border x:Name="ContentOuterBorder"
-                    Grid.Row="1">
-              <Border.Margin>
-                <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}"
-                              ConverterParameter="0">
-                  <Binding Path="WindowThickness.Left"
-                           RelativeSource="{RelativeSource TemplatedParent}" />
-                  <Binding Path="WindowThickness.Bottom"
-                           RelativeSource="{RelativeSource TemplatedParent}" />
-                </MultiBinding>
-              </Border.Margin>
-              <Border x:Name="ContentBorder"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}">
-                <Border x:Name="ContentInnerBorder"
-                        BorderBrush="#FFF2F2F2"
-                        BorderThickness="0">
-                  <!-- only visible for ToolWindow -->
-                  <AdornerDecorator>
-                    <ContentPresenter x:Name="Content"
-                                      Content="{TemplateBinding Content}"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}" />
-                  </AdornerDecorator>
-                </Border>
-              </Border>
-            </Border>
-
-          </Grid>
-        </Border>
-      </Border>
-
-      <!-- Special Border to prevent all mouse inputs when this WindowControl is behind a modal window -->
-      <Border x:Name="PART_BlockMouseInputsBorder"
-              Background="Transparent"
-              Visibility="Collapsed" />
-    </Grid>
-    <ControlTemplate.Triggers>
-
-      <Trigger Property="WindowStyle"
-               Value="None">
-        <Setter Property="Height"
-                Value="0"
-                TargetName="HeaderRow" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="PART_Icon" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="Title" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="PART_HeaderThumb" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="ButtonsPanel" />
-        <Setter Property="Height"
-                Value="0"
-                TargetName="HeaderRow" />
-      </Trigger>
-
-
-
-      <Trigger Property="WindowStyle"
-               Value="ToolWindow">
-        <Setter Property="Height"
-                Value="Auto"
-                TargetName="HeaderRow" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="PART_Icon" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="ButtonsPanel" />
-        <Setter Property="Visibility"
-                Value="Visible"
-                TargetName="ToolWindowBorder" />
-        <Setter Property="CornerRadius"
-                Value="0"
-                TargetName="PART_WindowRoot" />
-        <Setter Property="CornerRadius"
-                Value="0"
-                TargetName="WindowRootInnerBorder" />
-        <Setter Property="BorderBrush"
-                Value="White"
-                TargetName="ContentOuterBorder" />
-        <Setter Property="BorderBrush"
-                Value="Black"
-                TargetName="ContentBorder" />
-        <Setter Property="BorderThickness"
-                Value="1"
-                TargetName="ContentInnerBorder" />
-      </Trigger>
-
-      <Trigger Property="IsActive"
-               Value="False">
-        <Setter Property="Background"
-                Value="{Binding WindowInactiveBackground, RelativeSource={RelativeSource TemplatedParent}}"
-                TargetName="PART_WindowRoot" />
-        <Setter Property="BorderBrush"
-                Value="#FF666666"
-                TargetName="PART_WindowRoot" />
-        <Setter Property="BorderBrush"
-                Value="#FF7B7B7B"
-                TargetName="ContentBorder" />
-        <Setter Property="IsEnabled"
-                Value="False"
-                TargetName="Content" />
-      </Trigger>
-
-      <Trigger Property="IsKeyboardFocusWithin"
-               Value="True">
-        <Setter Property="KeyboardNavigation.TabNavigation"
-                Value="Cycle" />
-      </Trigger>
-
-      <!-- Remove the Margin when there's no title to remove the TitleShadow glow effect. -->
-      <Trigger Property="Text"
-               Value=""
-               SourceName="TitleText">
-        <Setter Property="Margin"
-                Value="0"
-                TargetName="TitleText" />
-      </Trigger>
-
-      <Trigger Property="Text"
-               Value="{x:Null}"
-               SourceName="TitleText">
-        <Setter Property="Margin"
-                Value="0"
-                TargetName="TitleText" />
-      </Trigger>
-
-      <!-- Center the Window Title on the entire window -->
-      <DataTrigger Value="1">
-        <DataTrigger.Binding>
-          <MultiBinding Converter="{StaticResource CenterTitleConverter}">
-            <Binding ElementName="TitleText"
-                     Path="DesiredSize" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ActualWidth" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ColumnDefinitions" />
-          </MultiBinding>
-        </DataTrigger.Binding>
-        <Setter TargetName="Title"
-                Property="Column"
-                Value="0" />
-        <Setter TargetName="Title"
-                Property="ColumnSpan"
-                Value="4" />
-        <Setter TargetName="TitleGrid"
-                Property="HorizontalAlignment"
-                Value="Center" />
-      </DataTrigger>
-
-      <!-- Center the Window Title in it's own column -->
-      <DataTrigger Value="2">
-        <DataTrigger.Binding>
-          <MultiBinding Converter="{StaticResource CenterTitleConverter}">
-            <Binding ElementName="TitleText"
-                     Path="DesiredSize" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ActualWidth" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ColumnDefinitions" />
-          </MultiBinding>
-        </DataTrigger.Binding>
-        <Setter TargetName="TitleGrid"
-                Property="HorizontalAlignment"
-                Value="Center" />
-      </DataTrigger>
-
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:WindowControl}">
-    <Setter Property="CloseButtonStyle"
-            Value="{StaticResource {ComponentResourceKey 
-                  TypeInTargetAssembly={x:Type local:WindowControl}, 
-                  ResourceId=DefaultCloseButtonStyle}}" />
-    <Setter Property="BorderBrush"
-            Value="{StaticResource Window_BorderBrush}" />
-    <Setter Property="BorderThickness"
-            Value="{StaticResource Window_BorderThickness}" />
-    <Setter Property="Background"
-            Value="{StaticResource Window_Background}" />
-    <Setter Property="CaptionFontSize"
-            Value="{StaticResource Window_CaptionFontSize}" />
-    <Setter Property="CaptionForeground"
-            Value="{StaticResource Window_CaptionForeground}" />
-    <Setter Property="WindowBorderBrush"
-            Value="{StaticResource Window_WindowBorderBrush}" />
-    <Setter Property="WindowBackground"
-            Value="{StaticResource Window_WindowBackground}" />
-    <Setter Property="WindowBorderThickness"
-            Value="{StaticResource Window_WindowBorderThickness}" />
-    <Setter Property="WindowInactiveBackground"
-            Value="{StaticResource Window_WindowInactiveBackground}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="KeyboardNavigation.TabNavigation"
-            Value="None" />
-    <Setter Property="Template"
-            Value="{StaticResource WindowControlTemplate}" />
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
deleted file mode 100644
index 5fa821af..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Themes
-{
-  public static class ResourceKeys
-  {
-    #region Brush Keys
-
-    public static readonly ComponentResourceKey ControlNormalBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlNormalBackgroundKey" );
-    public static readonly ComponentResourceKey ControlDisabledBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlDisabledBackgroundKey" );
-    public static readonly ComponentResourceKey ControlNormalBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlNormalBorderKey" );
-    public static readonly ComponentResourceKey ControlMouseOverBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlMouseOverBorderKey" );
-    public static readonly ComponentResourceKey ControlSelectedBorderKey = new ComponentResourceKey(typeof(ResourceKeys), "ControlSelectedBorderKey");
-    public static readonly ComponentResourceKey ControlFocusedBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlFocusedBorderKey" );
-
-    public static readonly ComponentResourceKey ButtonNormalOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonNormalOuterBorderKey" );
-    public static readonly ComponentResourceKey ButtonNormalInnerBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonNormalInnerBorderKey" );
-    public static readonly ComponentResourceKey ButtonNormalBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonNormalBackgroundKey" );
-
-    public static readonly ComponentResourceKey ButtonMouseOverBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonMouseOverBackgroundKey" );
-    public static readonly ComponentResourceKey ButtonMouseOverOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonMouseOverOuterBorderKey" );
-    public static readonly ComponentResourceKey ButtonMouseOverInnerBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonMouseOverInnerBorderKey" );
-
-    public static readonly ComponentResourceKey ButtonPressedOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonPressedOuterBorderKey" );
-    public static readonly ComponentResourceKey ButtonPressedInnerBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonPressedInnerBorderKey" );
-    public static readonly ComponentResourceKey ButtonPressedBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonPressedBackgroundKey" );
-
-    public static readonly ComponentResourceKey ButtonFocusedOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonFocusedOuterBorderKey" );
-    public static readonly ComponentResourceKey ButtonFocusedInnerBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonFocusedInnerBorderKey" );
-    public static readonly ComponentResourceKey ButtonFocusedBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonFocusedBackgroundKey" );
-
-    public static readonly ComponentResourceKey ButtonDisabledOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonDisabledOuterBorderKey" );
-    public static readonly ComponentResourceKey ButtonInnerBorderDisabledKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonInnerBorderDisabledKey" );
-
-    #endregion //Brush Keys
-
-    public static readonly ComponentResourceKey GlyphNormalForegroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "GlyphNormalForegroundKey" );
-    public static readonly ComponentResourceKey GlyphDisabledForegroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "GlyphDisabledForegroundKey" );
-
-    public static readonly ComponentResourceKey SpinButtonCornerRadiusKey = new ComponentResourceKey( typeof( ResourceKeys ), "SpinButtonCornerRadiusKey" );
-
-    public static readonly ComponentResourceKey SpinnerButtonStyleKey = new ComponentResourceKey( typeof( ResourceKeys ), "SpinnerButtonStyleKey" );
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
deleted file mode 100644
index ac2430fc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
+++ /dev/null
@@ -1,859 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Input;
-using System.Globalization;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  [TemplatePart( Name = PART_TextBox, Type = typeof( TextBox ) )]
-  [TemplatePart( Name = PART_Spinner, Type = typeof( Spinner ) )]
-  public abstract class UpDownBase<T> : InputBase, IValidateInput
-  {
-    #region Members
-
-    /// <summary>
-    /// Name constant for Text template part.
-    /// </summary>
-    internal const string PART_TextBox = "PART_TextBox";
-
-    /// <summary>
-    /// Name constant for Spinner template part.
-    /// </summary>
-    internal const string PART_Spinner = "PART_Spinner";
-
-    internal bool _isTextChangedFromUI;
-
-    /// <summary>
-    /// Flags if the Text and Value properties are in the process of being sync'd
-    /// </summary>
-    private bool _isSyncingTextAndValueProperties;
-    private bool _internalValueSet;
-
-    #endregion //Members
-
-    #region Properties
-
-    protected Spinner Spinner
-    {
-      get;
-      private set;
-    }
-    protected TextBox TextBox
-    {
-      get;
-      private set;
-    }
-
-    #region AllowSpin
-
-    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( UpDownBase<T> ),
-
-new UIPropertyMetadata( true ) );
-    public bool AllowSpin
-    {
-      get
-      {
-        return (bool)GetValue( AllowSpinProperty );
-      }
-      set
-      {
-        SetValue( AllowSpinProperty, value );
-      }
-    }
-
-    #endregion //AllowSpin
-
-    #region ButtonSpinnerLocation
-
-    public static readonly DependencyProperty ButtonSpinnerLocationProperty = DependencyProperty.Register( "ButtonSpinnerLocation", typeof( Location
-
-), typeof( UpDownBase<T> ), new UIPropertyMetadata( Location.Right ) );
-    public Location ButtonSpinnerLocation
-    {
-      get
-      {
-        return (Location)GetValue( ButtonSpinnerLocationProperty );
-      }
-      set
-      {
-        SetValue( ButtonSpinnerLocationProperty, value );
-      }
-    }
-
-    #endregion //ButtonSpinnerLocation
-
-    #region ClipValueToMinMax
-
-    public static readonly DependencyProperty ClipValueToMinMaxProperty = DependencyProperty.Register( "ClipValueToMinMax", typeof( bool ), typeof(
-
-UpDownBase<T> ), new UIPropertyMetadata( false ) );
-    public bool ClipValueToMinMax
-    {
-      get
-      {
-        return (bool)GetValue( ClipValueToMinMaxProperty );
-      }
-      set
-      {
-        SetValue( ClipValueToMinMaxProperty, value );
-      }
-    }
-
-    #endregion //ClipValueToMinMax
-
-    #region DisplayDefaultValueOnEmptyText
-
-    public static readonly DependencyProperty DisplayDefaultValueOnEmptyTextProperty = DependencyProperty.Register( "DisplayDefaultValueOnEmptyText",
-
-typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( false, OnDisplayDefaultValueOnEmptyTextChanged ) );
-    public bool DisplayDefaultValueOnEmptyText
-    {
-      get
-      {
-        return (bool)GetValue( DisplayDefaultValueOnEmptyTextProperty );
-      }
-      set
-      {
-        SetValue( DisplayDefaultValueOnEmptyTextProperty, value );
-      }
-    }
-
-    private static void OnDisplayDefaultValueOnEmptyTextChanged( DependencyObject source, DependencyPropertyChangedEventArgs args )
-    {
-      ((UpDownBase<T>)source).OnDisplayDefaultValueOnEmptyTextChanged( (bool)args.OldValue, (bool)args.NewValue );
-    }
-
-    private void OnDisplayDefaultValueOnEmptyTextChanged( bool oldValue, bool newValue )
-    {
-      if( this.IsInitialized && string.IsNullOrEmpty( Text ) )
-      {
-        this.SyncTextAndValueProperties( false, Text );
-      }
-    }
-
-    #endregion //DisplayDefaultValueOnEmptyText
-
-    #region DefaultValue
-
-    public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register( "DefaultValue", typeof( T ), typeof( UpDownBase<T>
-
-), new UIPropertyMetadata( default( T ), OnDefaultValueChanged ) );
-    public T DefaultValue
-    {
-      get
-      {
-        return (T)GetValue( DefaultValueProperty );
-      }
-      set
-      {
-        SetValue( DefaultValueProperty, value );
-      }
-    }
-
-    private static void OnDefaultValueChanged( DependencyObject source, DependencyPropertyChangedEventArgs args )
-    {
-      ((UpDownBase<T>)source).OnDefaultValueChanged( (T)args.OldValue, (T)args.NewValue );
-    }
-
-    private void OnDefaultValueChanged( T oldValue, T newValue )
-    {
-      if( this.IsInitialized && string.IsNullOrEmpty( Text ) )
-      {
-        this.SyncTextAndValueProperties( true, Text );
-      }
-    }
-
-    #endregion //DefaultValue
-
-    #region Maximum
-
-    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register( "Maximum", typeof( T ), typeof( UpDownBase<T> ), new
-
-UIPropertyMetadata( default( T ), OnMaximumChanged, OnCoerceMaximum ) );
-    public T Maximum
-    {
-      get
-      {
-        return (T)GetValue( MaximumProperty );
-      }
-      set
-      {
-        SetValue( MaximumProperty, value );
-      }
-    }
-
-    private static void OnMaximumChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      UpDownBase<T> upDown = o as UpDownBase<T>;
-      if( upDown != null )
-        upDown.OnMaximumChanged( (T)e.OldValue, (T)e.NewValue );
-    }
-
-    protected virtual void OnMaximumChanged( T oldValue, T newValue )
-    {
-      if( this.IsInitialized )
-      {
-        SetValidSpinDirection();
-      }
-    }
-
-    private static object OnCoerceMaximum( DependencyObject d, object baseValue )
-    {
-      UpDownBase<T> upDown = d as UpDownBase<T>;
-      if( upDown != null )
-        return upDown.OnCoerceMaximum( (T)baseValue );
-
-      return baseValue;
-    }
-
-    protected virtual T OnCoerceMaximum( T baseValue )
-    {
-      return baseValue;
-    }
-
-    #endregion //Maximum
-
-    #region Minimum
-
-    public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register( "Minimum", typeof( T ), typeof( UpDownBase<T> ), new
-
-UIPropertyMetadata( default( T ), OnMinimumChanged, OnCoerceMinimum ) );
-    public T Minimum
-    {
-      get
-      {
-        return (T)GetValue( MinimumProperty );
-      }
-      set
-      {
-        SetValue( MinimumProperty, value );
-      }
-    }
-
-    private static void OnMinimumChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      UpDownBase<T> upDown = o as UpDownBase<T>;
-      if( upDown != null )
-        upDown.OnMinimumChanged( (T)e.OldValue, (T)e.NewValue );
-    }
-
-    protected virtual void OnMinimumChanged( T oldValue, T newValue )
-    {
-      if( this.IsInitialized )
-      {
-        SetValidSpinDirection();
-      }
-    }
-
-    private static object OnCoerceMinimum( DependencyObject d, object baseValue )
-    {
-      UpDownBase<T> upDown = d as UpDownBase<T>;
-      if( upDown != null )
-        return upDown.OnCoerceMinimum( (T)baseValue );
-
-      return baseValue;
-    }
-
-    protected virtual T OnCoerceMinimum( T baseValue )
-    {
-      return baseValue;
-    }
-
-    #endregion //Minimum
-
-    #region MouseWheelActiveTrigger
-
-    /// <summary>
-    /// Identifies the MouseWheelActiveTrigger dependency property
-    /// </summary>
-    public static readonly DependencyProperty MouseWheelActiveTriggerProperty = DependencyProperty.Register( "MouseWheelActiveTrigger", typeof(
-
-MouseWheelActiveTrigger ), typeof( UpDownBase<T> ), new UIPropertyMetadata( MouseWheelActiveTrigger.FocusedMouseOver ) );
-
-    /// <summary>
-    /// Get or set when the mouse wheel event should affect the value.
-    /// </summary>
-    public MouseWheelActiveTrigger MouseWheelActiveTrigger
-    {
-      get
-      {
-        return (MouseWheelActiveTrigger)GetValue( MouseWheelActiveTriggerProperty );
-      }
-      set
-      {
-        SetValue( MouseWheelActiveTriggerProperty, value );
-      }
-    }
-
-    #endregion //MouseWheelActiveTrigger
-
-    #region MouseWheelActiveOnFocus
-
-    [Obsolete( "Use MouseWheelActiveTrigger property instead" )]
-    public static readonly DependencyProperty MouseWheelActiveOnFocusProperty = DependencyProperty.Register( "MouseWheelActiveOnFocus", typeof( bool
-
-), typeof( UpDownBase<T> ), new UIPropertyMetadata( true, OnMouseWheelActiveOnFocusChanged ) );
-
-    [Obsolete( "Use MouseWheelActiveTrigger property instead" )]
-    public bool MouseWheelActiveOnFocus
-    {
-      get
-      {
-#pragma warning disable 618
-        return (bool)GetValue( MouseWheelActiveOnFocusProperty );
-#pragma warning restore 618
-      }
-      set
-      {
-#pragma warning disable 618
-        SetValue( MouseWheelActiveOnFocusProperty, value );
-#pragma warning restore 618
-      }
-    }
-
-    private static void OnMouseWheelActiveOnFocusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      UpDownBase<T> upDownBase = o as UpDownBase<T>;
-      if( upDownBase != null )
-        upDownBase.MouseWheelActiveTrigger = ((bool)e.NewValue)
-          ? MouseWheelActiveTrigger.FocusedMouseOver
-          : MouseWheelActiveTrigger.MouseOver;
-    }
-
-    #endregion //MouseWheelActiveOnFocus
-
-    #region ShowButtonSpinner
-
-    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof(
-
-UpDownBase<T> ), new UIPropertyMetadata( true ) );
-    public bool ShowButtonSpinner
-    {
-      get
-      {
-        return (bool)GetValue( ShowButtonSpinnerProperty );
-      }
-      set
-      {
-        SetValue( ShowButtonSpinnerProperty, value );
-      }
-    }
-
-    #endregion //ShowButtonSpinner
-
-    #region UpdateValueOnEnterKey
-
-    public static readonly DependencyProperty UpdateValueOnEnterKeyProperty = DependencyProperty.Register( "UpdateValueOnEnterKey", typeof( bool ), typeof( UpDownBase<T> ), 
-      new FrameworkPropertyMetadata( false, OnUpdateValueOnEnterKeyChanged ) );
-    public bool UpdateValueOnEnterKey
-    {
-      get
-      {
-        return (bool)GetValue( UpdateValueOnEnterKeyProperty );
-      }
-      set
-      {
-        SetValue( UpdateValueOnEnterKeyProperty, value );
-      }
-    }
-
-    private static void OnUpdateValueOnEnterKeyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var upDownBase = o as UpDownBase<T>;
-      if( upDownBase != null )
-        upDownBase.OnUpdateValueOnEnterKeyChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnUpdateValueOnEnterKeyChanged( bool oldValue, bool newValue )
-    {
-    }
-
-    #endregion //UpdateValueOnEnterKey
-
-    #region Value
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( T ), typeof( UpDownBase<T> ), 
-      new FrameworkPropertyMetadata( default( T ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged, OnCoerceValue, false, UpdateSourceTrigger.PropertyChanged ) );
-    public T Value
-    {
-      get
-      {
-        return (T)GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private void SetValueInternal( T value )
-    {
-      _internalValueSet = true;
-      try
-      {
-        this.Value = value;
-      }
-      finally
-      {
-        _internalValueSet = false;
-      }
-    }
-
-    private static object OnCoerceValue( DependencyObject o, object basevalue )
-    {
-      return ((UpDownBase<T>)o).OnCoerceValue( basevalue );
-    }
-
-    protected virtual object OnCoerceValue( object newValue )
-    {
-      return newValue;
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      UpDownBase<T> upDownBase = o as UpDownBase<T>;
-      if( upDownBase != null )
-        upDownBase.OnValueChanged( (T)e.OldValue, (T)e.NewValue );
-    }
-
-    protected virtual void OnValueChanged( T oldValue, T newValue )
-    {
-      if( !_internalValueSet && this.IsInitialized )
-      {
-        SyncTextAndValueProperties( false, null, true );
-      }
-
-      SetValidSpinDirection();
-
-      this.RaiseValueChangedEvent( oldValue, newValue );
-    }
-
-    #endregion //Value
-
-    #endregion //Properties
-
-    #region Constructors
-
-    internal UpDownBase()
-    {
-
-      this.AddHandler( Mouse.PreviewMouseDownOutsideCapturedElementEvent, new RoutedEventHandler( this.HandleClickOutsideOfControlWithMouseCapture ),
-
-true );
-      this.IsKeyboardFocusWithinChanged += this.UpDownBase_IsKeyboardFocusWithinChanged;
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override void OnAccessKey( AccessKeyEventArgs e )
-    {
-      if( TextBox != null )
-        TextBox.Focus();
-
-      base.OnAccessKey( e );
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( TextBox != null )
-      {
-        TextBox.TextChanged -= new TextChangedEventHandler( TextBox_TextChanged );
-        TextBox.RemoveHandler( Mouse.PreviewMouseDownEvent, new MouseButtonEventHandler( this.TextBox_PreviewMouseDown ) );
-      }
-
-      TextBox = GetTemplateChild( PART_TextBox ) as TextBox;
-
-      if( TextBox != null )
-      {
-        TextBox.Text = Text;
-        TextBox.TextChanged += new TextChangedEventHandler( TextBox_TextChanged );
-        TextBox.AddHandler( Mouse.PreviewMouseDownEvent, new MouseButtonEventHandler( this.TextBox_PreviewMouseDown ), true );
-      }
-
-      if( Spinner != null )
-        Spinner.Spin -= OnSpinnerSpin;
-
-      Spinner = GetTemplateChild( PART_Spinner ) as Spinner;
-
-      if( Spinner != null )
-        Spinner.Spin += OnSpinnerSpin;
-
-      SetValidSpinDirection();
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      switch( e.Key )
-      {
-        case Key.Enter:
-          {
-            // Commit Text on "Enter" to raise Error event 
-            bool commitSuccess = CommitInput();
-            //Only handle if an exception is detected (Commit fails)
-            e.Handled = !commitSuccess;
-            break;
-          }
-      }
-    }
-
-    protected override void OnTextChanged( string oldValue, string newValue )
-    {
-      if( this.IsInitialized )
-      {
-        // When text is typed, if UpdateValueOnEnterKey is true, 
-        // Sync Value on Text only when Enter Key is pressed.
-        if( this.UpdateValueOnEnterKey )
-        {
-          if( !_isTextChangedFromUI )
-          {
-            this.SyncTextAndValueProperties( true, Text );
-          }
-        }
-        else
-        {
-          this.SyncTextAndValueProperties( true, Text );
-        }
-      }
-    }
-
-    protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
-    {
-      if( IsInitialized )
-      {
-        SyncTextAndValueProperties( false, null );
-      }
-    }
-
-    protected override void OnReadOnlyChanged( bool oldValue, bool newValue )
-    {
-      SetValidSpinDirection();
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void TextBox_PreviewMouseDown( object sender, RoutedEventArgs e )
-    {
-      if( this.MouseWheelActiveTrigger == Primitives.MouseWheelActiveTrigger.Focused )
-      {
-        //Capture the spinner when user clicks on the control.
-        if( Mouse.Captured != this.Spinner )
-        {
-          //Delay the capture to let the DateTimeUpDown select a new DateTime part.
-          this.Dispatcher.BeginInvoke( DispatcherPriority.Input, new Action( () =>
-          {
-            Mouse.Capture( this.Spinner );
-          }
-          ) );
-        }
-      }
-    }
-
-    private void HandleClickOutsideOfControlWithMouseCapture( object sender, RoutedEventArgs e )
-    {
-      if( Mouse.Captured is Spinner )
-      {
-        //Release the captured spinner when user clicks away from spinner.
-        this.Spinner.ReleaseMouseCapture();
-      }
-    }
-
-    private void OnSpinnerSpin( object sender, SpinEventArgs e )
-    {
-      if( AllowSpin && !IsReadOnly )
-      {
-        var activeTrigger = this.MouseWheelActiveTrigger;
-        bool spin = !e.UsingMouseWheel;
-        spin |= (activeTrigger == MouseWheelActiveTrigger.MouseOver);
-        spin |= ( (TextBox  != null) && TextBox.IsFocused && (activeTrigger == MouseWheelActiveTrigger.FocusedMouseOver));
-        spin |= ( (TextBox != null) && TextBox.IsFocused && (activeTrigger == MouseWheelActiveTrigger.Focused) && (Mouse.Captured is Spinner));
-
-        if( spin )
-        {
-          e.Handled = true;
-          OnSpin( e );
-        }
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Events
-
-    public event InputValidationErrorEventHandler InputValidationError;
-
-    public event EventHandler<SpinEventArgs> Spinned;
-
-    #region ValueChanged Event
-
-    //Due to a bug in Visual Studio, you cannot create event handlers for generic T args in XAML, so I have to use object instead.
-    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof(
-
-RoutedPropertyChangedEventHandler<object> ), typeof( UpDownBase<T> ) );
-    public event RoutedPropertyChangedEventHandler<object> ValueChanged
-    {
-      add
-      {
-        AddHandler( ValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ValueChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #endregion //Events
-
-    #region Methods
-
-    protected virtual void OnSpin( SpinEventArgs e )
-    {
-      if( e == null )
-        throw new ArgumentNullException( "e" );
-
-      // Raise the Spinned event to user
-      EventHandler<SpinEventArgs> handler = this.Spinned;
-      if( handler != null )
-      {
-        handler( this, e );
-      }
-
-      if( e.Direction == SpinDirection.Increase )
-        DoIncrement();
-      else
-        DoDecrement();
-    }
-
-    protected virtual void RaiseValueChangedEvent( T oldValue, T newValue )
-    {
-      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
-      args.RoutedEvent = ValueChangedEvent;
-      RaiseEvent( args );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-      // When both Value and Text are initialized, Value has priority.
-      // To be sure that the value is not initialized, it should
-      // have no local value, no binding, and equal to the default value.
-      bool updateValueFromText =
-        (this.ReadLocalValue( ValueProperty ) == DependencyProperty.UnsetValue)
-        && (BindingOperations.GetBinding( this, ValueProperty ) == null)
-        && (object.Equals( this.Value, ValueProperty.DefaultMetadata.DefaultValue ));
-
-      this.SyncTextAndValueProperties( updateValueFromText, Text, !updateValueFromText );
-    }
-
-    /// <summary>
-    /// Performs an increment if conditions allow it.
-    /// </summary>
-    internal void DoDecrement()
-    {
-      if( Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease )
-      {
-        OnDecrement();
-      }
-    }
-
-    /// <summary>
-    /// Performs a decrement if conditions allow it.
-    /// </summary>
-    internal void DoIncrement()
-    {
-      if( Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase )
-      {
-        OnIncrement();
-      }
-    }
-
-    private void TextBox_TextChanged( object sender, TextChangedEventArgs e )
-    {
-      if( !this.IsKeyboardFocusWithin )
-        return;
-
-      try
-      {
-        _isTextChangedFromUI = true;
-        Text = ((TextBox)sender).Text;
-      }
-      finally
-      {
-        _isTextChangedFromUI = false;
-      }
-    }
-
-    private void UpDownBase_IsKeyboardFocusWithinChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      if( !(bool)e.NewValue )
-      {
-        this.CommitInput();
-      }
-    }
-
-    private void RaiseInputValidationError( Exception e )
-    {
-      if( InputValidationError != null )
-      {
-        InputValidationErrorEventArgs args = new InputValidationErrorEventArgs( e );
-        InputValidationError( this, args );
-        if( args.ThrowException )
-        {
-          throw args.Exception;
-        }
-      }
-    }
-
-    public virtual bool CommitInput()
-    {
-      return this.SyncTextAndValueProperties( true, Text );
-    }
-
-    protected bool SyncTextAndValueProperties( bool updateValueFromText, string text )
-    {
-      return this.SyncTextAndValueProperties( updateValueFromText, text, false );
-    }
-
-    private bool SyncTextAndValueProperties( bool updateValueFromText, string text, bool forceTextUpdate )
-    {
-      if( _isSyncingTextAndValueProperties )
-        return true;
-
-      _isSyncingTextAndValueProperties = true;
-      bool parsedTextIsValid = true;
-      try
-      {
-        if( updateValueFromText )
-        {
-          if( string.IsNullOrEmpty( text ) )
-          {
-            // An empty input sets the value to the default value.
-            this.SetValueInternal( this.DefaultValue );
-          }
-          else
-          {
-            try
-            {
-              T newValue = this.ConvertTextToValue( text );
-              if( !object.Equals( newValue, this.Value ) )
-              {
-                this.SetValueInternal( newValue );
-              }
-            }
-            catch( Exception e )
-            {
-              parsedTextIsValid = false;
-
-              // From the UI, just allow any input.
-              if( !_isTextChangedFromUI )
-              {
-                // This call may throw an exception. 
-                // See RaiseInputValidationError() implementation.
-                this.RaiseInputValidationError( e );
-              }
-            }
-          }
-        }
-
-        // Do not touch the ongoing text input from user.
-        if( !_isTextChangedFromUI )
-        {
-          // Don't replace the empty Text with the non-empty representation of DefaultValue.
-          bool shouldKeepEmpty = !forceTextUpdate && string.IsNullOrEmpty( Text ) && object.Equals( Value, DefaultValue ) && !this.DisplayDefaultValueOnEmptyText;
-          if( !shouldKeepEmpty )
-          {
-            string newText = ConvertValueToText();
-            if( !object.Equals( this.Text, newText ) )
-            {
-              Text = newText;
-            }
-          }
-
-          // Sync Text and textBox
-          if( TextBox != null )
-            TextBox.Text = Text;
-        }
-
-        if( _isTextChangedFromUI && !parsedTextIsValid )
-        {
-          // Text input was made from the user and the text
-          // repesents an invalid value. Disable the spinner
-          // in this case.
-          if( Spinner != null )
-          {
-            Spinner.ValidSpinDirection = ValidSpinDirections.None;
-          }
-        }
-        else
-        {
-          this.SetValidSpinDirection();
-        }
-      }
-      finally
-      {
-        _isSyncingTextAndValueProperties = false;
-      }
-      return parsedTextIsValid;
-    }
-
-    #region Abstract
-
-    /// <summary>
-    /// Converts the formatted text to a value.
-    /// </summary>
-    protected abstract T ConvertTextToValue( string text );
-
-    /// <summary>
-    /// Converts the value to formatted text.
-    /// </summary>
-    /// <returns></returns>
-    protected abstract string ConvertValueToText();
-
-    /// <summary>
-    /// Called by OnSpin when the spin direction is SpinDirection.Increase.
-    /// </summary>
-    protected abstract void OnIncrement();
-
-    /// <summary>
-    /// Called by OnSpin when the spin direction is SpinDirection.Descrease.
-    /// </summary>
-    protected abstract void OnDecrement();
-
-    /// <summary>
-    /// Sets the valid spin directions.
-    /// </summary>
-    protected abstract void SetValidSpinDirection();
-
-    #endregion //Abstract
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
deleted file mode 100644
index 46cb091b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
+++ /dev/null
@@ -1,1212 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows;
-using System.Collections;
-using System.Reflection;
-using System.Windows.Input;
-using System.Windows.Documents;
-using System.Globalization;
-using Microsoft.Win32;
-using System.ComponentModel;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Windows.Automation;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public class ValueRangeTextBox : AutoSelectTextBox
-  {
-    static ValueRangeTextBox()
-    {
-      ValueRangeTextBox.TextProperty.OverrideMetadata( typeof( ValueRangeTextBox ),
-        new FrameworkPropertyMetadata(
-        null,
-        new CoerceValueCallback( ValueRangeTextBox.TextCoerceValueCallback ) ) );
-
-      ValueRangeTextBox.AcceptsReturnProperty.OverrideMetadata( typeof( ValueRangeTextBox ),
-        new FrameworkPropertyMetadata(
-        false, null, new CoerceValueCallback( ValueRangeTextBox.AcceptsReturnCoerceValueCallback ) ) );
-
-      ValueRangeTextBox.AcceptsTabProperty.OverrideMetadata( typeof( ValueRangeTextBox ),
-        new FrameworkPropertyMetadata(
-        false, null, new CoerceValueCallback( ValueRangeTextBox.AcceptsTabCoerceValueCallback ) ) );
-    }
-
-    public ValueRangeTextBox()
-    {
-    }
-
-    #region AcceptsReturn Property
-
-    private static object AcceptsReturnCoerceValueCallback( DependencyObject sender, object value )
-    {
-      bool acceptsReturn = ( bool )value;
-
-      if( acceptsReturn )
-        throw new NotSupportedException( "The ValueRangeTextBox does not support the AcceptsReturn property." );
-
-      return false;
-    }
-
-    #endregion AcceptsReturn Property
-
-    #region AcceptsTab Property
-
-    private static object AcceptsTabCoerceValueCallback( DependencyObject sender, object value )
-    {
-      bool acceptsTab = ( bool )value;
-
-      if( acceptsTab )
-        throw new NotSupportedException( "The ValueRangeTextBox does not support the AcceptsTab property." );
-
-      return false;
-    }
-
-    #endregion AcceptsTab Property
-
-    #region BeepOnError Property
-
-    public bool BeepOnError
-    {
-      get
-      {
-        return ( bool )GetValue( BeepOnErrorProperty );
-      }
-      set
-      {
-        SetValue( BeepOnErrorProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty BeepOnErrorProperty =
-        DependencyProperty.Register( "BeepOnError", typeof( bool ), typeof( ValueRangeTextBox ), new UIPropertyMetadata( false ) );
-
-    #endregion BeepOnError Property
-
-    #region FormatProvider Property
-
-    public IFormatProvider FormatProvider
-    {
-      get
-      {
-        return ( IFormatProvider )GetValue( FormatProviderProperty );
-      }
-      set
-      {
-        SetValue( FormatProviderProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty FormatProviderProperty =
-        DependencyProperty.Register( "FormatProvider", typeof( IFormatProvider ), typeof( ValueRangeTextBox ),
-      new UIPropertyMetadata( null,
-      new PropertyChangedCallback( ValueRangeTextBox.FormatProviderPropertyChangedCallback ) ) );
-
-    private static void FormatProviderPropertyChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ValueRangeTextBox valueRangeTextBox = ( ValueRangeTextBox )sender;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return;
-
-      valueRangeTextBox.OnFormatProviderChanged();
-    }
-
-    internal virtual void OnFormatProviderChanged()
-    {
-      this.RefreshConversionHelpers();
-      this.RefreshCurrentText( false );
-      this.RefreshValue();
-    }
-
-    #endregion FormatProvider Property
-
-    #region MinValue Property
-
-    public object MinValue
-    {
-      get
-      {
-        return ( object )GetValue( MinValueProperty );
-      }
-      set
-      {
-        SetValue( MinValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty MinValueProperty =
-        DependencyProperty.Register( "MinValue", typeof( object ), typeof( ValueRangeTextBox ),
-      new UIPropertyMetadata(
-      null,
-      null,
-      new CoerceValueCallback( ValueRangeTextBox.MinValueCoerceValueCallback ) ) );
-
-    private static object MinValueCoerceValueCallback( DependencyObject sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( value == null )
-        return value;
-
-      Type type = valueRangeTextBox.ValueDataType;
-
-      if( type == null )
-        throw new InvalidOperationException( "An attempt was made to set a minimum value when the ValueDataType property is null." );
-
-      if( valueRangeTextBox.IsFinalizingInitialization )
-        value = ValueRangeTextBox.ConvertValueToDataType( value, valueRangeTextBox.ValueDataType );
-
-      if( value.GetType() != type )
-        throw new ArgumentException( "The value is not of type " + type.Name + ".", "MinValue" );
-
-      IComparable comparable = value as IComparable;
-
-      if( comparable == null )
-        throw new InvalidOperationException( "MinValue does not implement the IComparable interface." );
-
-      // ValidateValueInRange will throw if it must.
-      object maxValue = valueRangeTextBox.MaxValue;
-
-      valueRangeTextBox.ValidateValueInRange( value, maxValue, valueRangeTextBox.Value );
-
-      return value;
-    }
-
-    #endregion MinValue Property
-
-    #region MaxValue Property
-
-    public object MaxValue
-    {
-      get
-      {
-        return ( object )GetValue( MaxValueProperty );
-      }
-      set
-      {
-        SetValue( MaxValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty MaxValueProperty =
-        DependencyProperty.Register( "MaxValue", typeof( object ), typeof( ValueRangeTextBox ),
-      new UIPropertyMetadata(
-      null,
-      null,
-      new CoerceValueCallback( MaxValueCoerceValueCallback ) ) );
-
-    private static object MaxValueCoerceValueCallback( DependencyObject sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( value == null )
-        return value;
-
-      Type type = valueRangeTextBox.ValueDataType;
-
-      if( type == null )
-        throw new InvalidOperationException( "An attempt was made to set a maximum value when the ValueDataType property is null." );
-
-      if( valueRangeTextBox.IsFinalizingInitialization )
-        value = ValueRangeTextBox.ConvertValueToDataType( value, valueRangeTextBox.ValueDataType );
-
-      if( value.GetType() != type )
-        throw new ArgumentException( "The value is not of type " + type.Name + ".", "MinValue" );
-
-      IComparable comparable = value as IComparable;
-
-      if( comparable == null )
-        throw new InvalidOperationException( "MaxValue does not implement the IComparable interface." );
-
-      object minValue = valueRangeTextBox.MinValue;
-
-      // ValidateValueInRange will throw if it must.
-      valueRangeTextBox.ValidateValueInRange( minValue, value, valueRangeTextBox.Value );
-
-      return value;
-    }
-
-    #endregion MaxValue Property
-
-    #region NullValue Property
-
-    public object NullValue
-    {
-      get
-      {
-        return ( object )GetValue( NullValueProperty );
-      }
-      set
-      {
-        SetValue( NullValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NullValueProperty =
-        DependencyProperty.Register( "NullValue", typeof( object ), typeof( ValueRangeTextBox ),
-      new UIPropertyMetadata(
-      null,
-      new PropertyChangedCallback( ValueRangeTextBox.NullValuePropertyChangedCallback ),
-      new CoerceValueCallback( NullValueCoerceValueCallback ) ) );
-
-    private static object NullValueCoerceValueCallback( DependencyObject sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( ( value == null ) || ( value == DBNull.Value ) )
-        return value;
-
-      Type type = valueRangeTextBox.ValueDataType;
-
-      if( type == null )
-        throw new InvalidOperationException( "An attempt was made to set a null value when the ValueDataType property is null." );
-
-      if( valueRangeTextBox.IsFinalizingInitialization )
-        value = ValueRangeTextBox.ConvertValueToDataType( value, valueRangeTextBox.ValueDataType );
-
-      if( value.GetType() != type )
-        throw new ArgumentException( "The value is not of type " + type.Name + ".", "NullValue" );
-
-      return value;
-    }
-
-    private static void NullValuePropertyChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( e.OldValue == null )
-      {
-        if( valueRangeTextBox.Value == null )
-          valueRangeTextBox.RefreshValue();
-      }
-      else
-      {
-        if( e.OldValue.Equals( valueRangeTextBox.Value ) )
-          valueRangeTextBox.RefreshValue();
-      }
-    }
-
-    #endregion NullValue Property
-
-    #region Value Property
-
-    public object Value
-    {
-      get
-      {
-        return ( object )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ValueProperty =
-        DependencyProperty.Register( "Value", typeof( object ), typeof( ValueRangeTextBox ),
-      new FrameworkPropertyMetadata(
-      null,
-      FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-      new PropertyChangedCallback( ValueRangeTextBox.ValuePropertyChangedCallback ),
-      new CoerceValueCallback( ValueRangeTextBox.ValueCoerceValueCallback ) ) );
-
-    private static object ValueCoerceValueCallback( object sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( valueRangeTextBox.IsFinalizingInitialization )
-        value = ValueRangeTextBox.ConvertValueToDataType( value, valueRangeTextBox.ValueDataType );
-
-      if( !valueRangeTextBox.IsForcingValue )
-        valueRangeTextBox.ValidateValue( value );
-
-      return value;
-    }
-
-    private static void ValuePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( valueRangeTextBox.IsForcingValue )
-        return;
-
-      // The ValueChangedCallback can be raised even though both values are the same since the property
-      // datatype is Object.
-      if( object.Equals( e.NewValue, e.OldValue ) )
-        return;
-
-      valueRangeTextBox.IsInValueChanged = true;
-      try
-      {
-        valueRangeTextBox.Text = valueRangeTextBox.GetTextFromValue( e.NewValue );
-      }
-      finally
-      {
-        valueRangeTextBox.IsInValueChanged = false;
-      }
-    }
-
-    #endregion Value Property
-
-    #region ValueDataType Property
-
-    public Type ValueDataType
-    {
-      get
-      {
-        return ( Type )GetValue( ValueDataTypeProperty );
-      }
-      set
-      {
-        SetValue( ValueDataTypeProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ValueDataTypeProperty =
-        DependencyProperty.Register( "ValueDataType", typeof( Type ), typeof( ValueRangeTextBox ),
-      new UIPropertyMetadata(
-      null,
-      new PropertyChangedCallback( ValueRangeTextBox.ValueDataTypePropertyChangedCallback ),
-      new CoerceValueCallback( ValueRangeTextBox.ValueDataTypeCoerceValueCallback ) ) );
-
-    private static object ValueDataTypeCoerceValueCallback( DependencyObject sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      Type valueDataType = value as Type;
-
-      try
-      {
-        valueRangeTextBox.ValidateDataType( valueDataType );
-      }
-      catch( Exception exception )
-      {
-        throw new ArgumentException( "An error occured while trying to change the ValueDataType.", exception );
-      }
-
-      return value;
-    }
-
-    private static void ValueDataTypePropertyChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      Type valueDataType = e.NewValue as Type;
-
-      valueRangeTextBox.IsNumericValueDataType = ValueRangeTextBox.IsNumericType( valueDataType );
-
-      valueRangeTextBox.RefreshConversionHelpers();
-
-      valueRangeTextBox.ConvertValuesToDataType( valueDataType );
-    }
-
-    internal virtual void ValidateDataType( Type type )
-    {
-      // Null will always be valid and will reset the MinValue, MaxValue, NullValue and Value to null.
-      if( type == null )
-        return;
-
-      // We use InvariantCulture instead of the active format provider since the FormatProvider is only
-      // used when the source type is String.  When we are converting from a string, we are
-      // actually converting a value from XAML.  Therefore, if the string will have a period as a
-      // decimal separator.  If we were using the active format provider, we could end up expecting a coma
-      // as the decimal separator and the ChangeType method would throw.
-
-      object minValue = this.MinValue;
-
-      if( ( minValue != null ) && ( minValue.GetType() != type ) )
-        minValue = System.Convert.ChangeType( minValue, type, CultureInfo.InvariantCulture );
-
-      object maxValue = this.MaxValue;
-
-      if( ( maxValue != null ) && ( maxValue.GetType() != type ) )
-        maxValue = System.Convert.ChangeType( maxValue, type, CultureInfo.InvariantCulture );
-
-      object nullValue = this.NullValue;
-
-      if( ( ( nullValue != null ) && ( nullValue != DBNull.Value ) )
-        && ( nullValue.GetType() != type ) )
-      {
-        nullValue = System.Convert.ChangeType( nullValue, type, CultureInfo.InvariantCulture );
-      }
-
-      object value = this.Value;
-
-      if( ( ( value != null ) && ( value != DBNull.Value ) )
-        && ( value.GetType() != type ) )
-      {
-        value = System.Convert.ChangeType( value, type, CultureInfo.InvariantCulture );
-      }
-
-      if( ( minValue != null ) || ( maxValue != null )
-        || ( ( nullValue != null ) && ( nullValue != DBNull.Value ) ) )
-      {
-        // Value comparaisons will occur.  Therefore, the aspiring data type must implement IComparable.
-
-        Type iComparable = type.GetInterface( "IComparable" );
-
-        if( iComparable == null )
-          throw new InvalidOperationException( "MinValue, MaxValue, and NullValue must implement the IComparable interface." );
-      }
-    }
-
-    private void ConvertValuesToDataType( Type type )
-    {
-      if( type == null )
-      {
-        this.MinValue = null;
-        this.MaxValue = null;
-        this.NullValue = null;
-
-        this.Value = null;
-
-        return;
-      }
-
-      object minValue = this.MinValue;
-
-      if( ( minValue != null ) && ( minValue.GetType() != type ) )
-        this.MinValue = ValueRangeTextBox.ConvertValueToDataType( minValue, type );
-
-      object maxValue = this.MaxValue;
-
-      if( ( maxValue != null ) && ( maxValue.GetType() != type ) )
-        this.MaxValue = ValueRangeTextBox.ConvertValueToDataType( maxValue, type );
-
-      object nullValue = this.NullValue;
-
-      if( ( ( nullValue != null ) && ( nullValue != DBNull.Value ) )
-        && ( nullValue.GetType() != type ) )
-      {
-        this.NullValue = ValueRangeTextBox.ConvertValueToDataType( nullValue, type );
-      }
-
-      object value = this.Value;
-
-      if( ( ( value != null ) && ( value != DBNull.Value ) )
-        && ( value.GetType() != type ) )
-      {
-        this.Value = ValueRangeTextBox.ConvertValueToDataType( value, type );
-      }
-    }
-
-    #endregion ValueDataType Property
-
-    #region Text Property
-
-    private static object TextCoerceValueCallback( object sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( value == null )
-        return string.Empty;
-
-      return value;
-    }
-
-    protected override void OnTextChanged( TextChangedEventArgs e )
-    {
-      // If in IME Composition, RefreshValue already returns without doing anything.
-      this.RefreshValue();
-
-      base.OnTextChanged( e );
-    }
-
-    #endregion Text Property
-
-    #region HasValidationError Property
-
-    private static readonly DependencyPropertyKey HasValidationErrorPropertyKey =
-        DependencyProperty.RegisterReadOnly( "HasValidationError", typeof( bool ), typeof( ValueRangeTextBox ), new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasValidationErrorProperty = ValueRangeTextBox.HasValidationErrorPropertyKey.DependencyProperty;
-
-    public bool HasValidationError
-    {
-      get
-      {
-        return ( bool )this.GetValue( ValueRangeTextBox.HasValidationErrorProperty );
-      }
-    }
-
-    private void SetHasValidationError( bool value )
-    {
-      this.SetValue( ValueRangeTextBox.HasValidationErrorPropertyKey, value );
-    }
-
-    #endregion HasValidationError Property
-
-    #region HasParsingError Property
-
-    private static readonly DependencyPropertyKey HasParsingErrorPropertyKey =
-        DependencyProperty.RegisterReadOnly( "HasParsingError", typeof( bool ), typeof( ValueRangeTextBox ), new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasParsingErrorProperty = ValueRangeTextBox.HasParsingErrorPropertyKey.DependencyProperty;
-
-    public bool HasParsingError
-    {
-      get
-      {
-        return ( bool )this.GetValue( ValueRangeTextBox.HasParsingErrorProperty );
-      }
-    }
-
-    internal void SetHasParsingError( bool value )
-    {
-      this.SetValue( ValueRangeTextBox.HasParsingErrorPropertyKey, value );
-    }
-
-    #endregion HasParsingError Property
-
-    #region IsValueOutOfRange Property
-
-    private static readonly DependencyPropertyKey IsValueOutOfRangePropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsValueOutOfRange", typeof( bool ), typeof( ValueRangeTextBox ), new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsValueOutOfRangeProperty = ValueRangeTextBox.IsValueOutOfRangePropertyKey.DependencyProperty;
-
-    public bool IsValueOutOfRange
-    {
-      get
-      {
-        return ( bool )this.GetValue( ValueRangeTextBox.IsValueOutOfRangeProperty );
-      }
-    }
-
-    private void SetIsValueOutOfRange( bool value )
-    {
-      this.SetValue( ValueRangeTextBox.IsValueOutOfRangePropertyKey, value );
-    }
-
-    #endregion IsValueOutOfRange Property
-
-    #region IsInValueChanged property
-
-    internal bool IsInValueChanged
-    {
-      get
-      {
-        return m_flags[ ( int )ValueRangeTextBoxFlags.IsInValueChanged ];
-      }
-      private set
-      {
-        m_flags[ ( int )ValueRangeTextBoxFlags.IsInValueChanged ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsForcingValue property
-
-    internal bool IsForcingValue
-    {
-      get
-      {
-        return m_flags[ ( int )ValueRangeTextBoxFlags.IsForcingValue ];
-      }
-      private set
-      {
-        m_flags[ ( int )ValueRangeTextBoxFlags.IsForcingValue ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsForcingText property
-
-    internal bool IsForcingText
-    {
-      get
-      {
-        return m_flags[ ( int )ValueRangeTextBoxFlags.IsForcingText ];
-      }
-      private set
-      {
-        m_flags[ ( int )ValueRangeTextBoxFlags.IsForcingText ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsNumericValueDataType property
-
-    internal bool IsNumericValueDataType
-    {
-      get
-      {
-        return m_flags[ ( int )ValueRangeTextBoxFlags.IsNumericValueDataType ];
-      }
-      private set
-      {
-        m_flags[ ( int )ValueRangeTextBoxFlags.IsNumericValueDataType ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsTextReadyToBeParsed property
-
-    internal virtual bool IsTextReadyToBeParsed
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
-    #region IsInIMEComposition property
-
-    internal bool IsInIMEComposition
-    {
-      get
-      {
-        return m_imePreCompositionCachedTextInfo != null;
-      }
-    }
-
-    #endregion
-
-    #region IsFinalizingInitialization Property
-
-    private bool IsFinalizingInitialization
-    {
-      get
-      {
-        return m_flags[ ( int )ValueRangeTextBoxFlags.IsFinalizingInitialization ];
-      }
-      set
-      {
-        m_flags[ ( int )ValueRangeTextBoxFlags.IsFinalizingInitialization ] = value;
-      }
-    }
-
-    #endregion
-
-    #region TEXT FROM VALUE
-
-    public event EventHandler<QueryTextFromValueEventArgs> QueryTextFromValue;
-
-    internal string GetTextFromValue( object value )
-    {
-      string text = this.QueryTextFromValueCore( value );
-
-      QueryTextFromValueEventArgs e = new QueryTextFromValueEventArgs( value, text );
-
-      this.OnQueryTextFromValue( e );
-
-      return e.Text;
-    }
-
-    protected virtual string QueryTextFromValueCore( object value )
-    {
-      if( ( value == null ) || ( value == DBNull.Value ) )
-        return string.Empty;
-
-      IFormatProvider formatProvider = this.GetActiveFormatProvider();
-
-      CultureInfo cultureInfo = formatProvider as CultureInfo;
-
-      if( cultureInfo != null )
-      {
-        TypeConverter converter = TypeDescriptor.GetConverter( value.GetType() );
-
-        if( converter.CanConvertTo( typeof( string ) ) )
-          return ( string )converter.ConvertTo( null, cultureInfo, value, typeof( string ) );
-      }
-
-      try
-      {
-        string result = System.Convert.ToString( value, formatProvider );
-
-        return result;
-      }
-      catch
-      {
-      }
-
-      return value.ToString();
-    }
-
-    private void OnQueryTextFromValue( QueryTextFromValueEventArgs e )
-    {
-      if( this.QueryTextFromValue != null )
-        this.QueryTextFromValue( this, e );
-    }
-
-    #endregion TEXT FROM VALUE
-
-    #region VALUE FROM TEXT
-
-    public event EventHandler<QueryValueFromTextEventArgs> QueryValueFromText;
-
-    internal object GetValueFromText( string text, out bool hasParsingError )
-    {
-      object value = null;
-      bool success = this.QueryValueFromTextCore( text, out value );
-
-      QueryValueFromTextEventArgs e = new QueryValueFromTextEventArgs( text, value );
-      e.HasParsingError = !success;
-
-      this.OnQueryValueFromText( e );
-
-      hasParsingError = e.HasParsingError;
-
-      return e.Value;
-    }
-
-    protected virtual bool QueryValueFromTextCore( string text, out object value )
-    {
-      value = null;
-
-      Type validatingType = this.ValueDataType;
-
-      text = text.Trim();
-
-      if( validatingType == null )
-        return true;
-
-      if( !validatingType.IsValueType && ( validatingType != typeof( string ) ) )
-        return false;
-
-      try
-      {
-        value = ChangeTypeHelper.ChangeType( text, validatingType, this.GetActiveFormatProvider() );
-      }
-      catch
-      {
-        if( this.BeepOnError )
-        {
-          System.Media.SystemSounds.Beep.Play();
-        }
-        return false;
-      }
-
-      return true;
-    }
-
-    private void OnQueryValueFromText( QueryValueFromTextEventArgs e )
-    {
-      if( this.QueryValueFromText != null )
-        this.QueryValueFromText( this, e );
-    }
-
-    #endregion VALUE FROM TEXT
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( ( e.ImeProcessedKey != Key.None ) && ( !this.IsInIMEComposition ) )
-      {
-        // Start of an IME Composition.  Cache all the critical infos.
-        this.StartIMEComposition();
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnGotFocus( RoutedEventArgs e )
-    {
-      base.OnGotFocus( e );
-
-      this.RefreshCurrentText( true );
-    }
-
-    protected override void OnLostFocus( RoutedEventArgs e )
-    {
-      base.OnLostFocus( e );
-
-      this.RefreshCurrentText( true );
-    }
-
-    protected override void OnTextInput( TextCompositionEventArgs e )
-    {
-      if( this.IsInIMEComposition )
-        this.EndIMEComposition();
-
-      base.OnTextInput( e );
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    protected virtual void ValidateValue( object value )
-    {
-      if( value == null )
-        return;
-
-      Type validatingType = this.ValueDataType;
-      if( validatingType.IsGenericType && validatingType.GetGenericTypeDefinition().Equals( typeof( Nullable<> ) ) )
-      {
-        NullableConverter nullableConverter = new NullableConverter( validatingType );
-        validatingType = nullableConverter.UnderlyingType;
-      }
-
-      if( validatingType == null )
-        throw new InvalidOperationException( "An attempt was made to set a value when the ValueDataType property is null." );
-
-      if( ( value != DBNull.Value ) && ( value.GetType() != validatingType ) )
-        throw new ArgumentException( "The value is not of type " + validatingType.Name + ".", "Value" );
-
-      this.ValidateValueInRange( this.MinValue, this.MaxValue, value );
-    }
-
-    internal static bool IsNumericType( Type type )
-    {
-      if( type == null )
-        return false;
-
-      if( type.IsValueType )
-      {
-        if( ( type == typeof( int ) ) || ( type == typeof( double ) ) || ( type == typeof( decimal ) )
-          || ( type == typeof( float ) ) || ( type == typeof( short ) ) || ( type == typeof( long ) )
-          || ( type == typeof( ushort ) ) || ( type == typeof( uint ) ) || ( type == typeof( ulong ) )
-          || ( type == typeof( byte ) )
-          )
-        {
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    internal void StartIMEComposition()
-    {
-      Debug.Assert( m_imePreCompositionCachedTextInfo == null, "EndIMEComposition should have been called before another IME Composition starts." );
-
-      m_imePreCompositionCachedTextInfo = new CachedTextInfo( this );
-    }
-
-    internal void EndIMEComposition()
-    {
-      CachedTextInfo cachedTextInfo = m_imePreCompositionCachedTextInfo.Clone() as CachedTextInfo;
-      m_imePreCompositionCachedTextInfo = null;
-
-      this.OnIMECompositionEnded( cachedTextInfo );
-    }
-
-    internal virtual void OnIMECompositionEnded( CachedTextInfo cachedTextInfo )
-    {
-    }
-
-    internal virtual void RefreshConversionHelpers()
-    {
-    }
-
-    internal IFormatProvider GetActiveFormatProvider()
-    {
-      IFormatProvider formatProvider = this.FormatProvider;
-
-      if( formatProvider != null )
-        return formatProvider;
-
-      return CultureInfo.CurrentCulture;
-    }
-
-    internal CultureInfo GetCultureInfo()
-    {
-      CultureInfo cultureInfo = this.GetActiveFormatProvider() as CultureInfo;
-
-      if( cultureInfo != null )
-        return cultureInfo;
-
-      return CultureInfo.CurrentCulture;
-    }
-
-    internal virtual string GetCurrentText()
-    {
-      return this.Text;
-    }
-
-    internal virtual string GetParsableText()
-    {
-      return this.Text;
-    }
-
-    internal void ForceText( string text, bool preserveCaret )
-    {
-      this.IsForcingText = true;
-      try
-      {
-        int oldCaretIndex = this.CaretIndex;
-
-        this.Text = text;
-
-        if( ( preserveCaret ) && ( this.IsLoaded ) )
-        {
-          try
-          {
-            this.SelectionStart = oldCaretIndex;
-          }
-          catch( NullReferenceException )
-          {
-          }
-        }
-      }
-      finally
-      {
-        this.IsForcingText = false;
-      }
-    }
-
-    internal bool IsValueNull( object value )
-    {
-      if( ( value == null ) || ( value == DBNull.Value ) )
-        return true;
-
-      Type type = this.ValueDataType;
-      if( type.IsGenericType && type.GetGenericTypeDefinition().Equals( typeof( Nullable<> ) ) )
-      {
-        NullableConverter nullableConverter = new NullableConverter( type );
-        type = nullableConverter.UnderlyingType;
-      }
-
-      if( value.GetType() != type )
-        value = System.Convert.ChangeType( value, type );
-
-      object nullValue = this.NullValue;
-
-      if( nullValue == null )
-        return false;
-
-      if( nullValue.GetType() != type )
-        nullValue = System.Convert.ChangeType( nullValue, type );
-
-      return nullValue.Equals( value );
-    }
-
-    internal void ForceValue( object value )
-    {
-      this.IsForcingValue = true;
-      try
-      {
-        this.Value = value;
-      }
-      finally
-      {
-        this.IsForcingValue = false;
-      }
-    }
-
-    internal void RefreshCurrentText( bool preserveCurrentCaretPosition )
-    {
-      string displayText = this.GetCurrentText();
-
-      if( !string.Equals( displayText, this.Text ) )
-        this.ForceText( displayText, preserveCurrentCaretPosition );
-    }
-
-    internal void RefreshValue()
-    {
-      if( ( this.IsForcingValue ) || ( this.ValueDataType == null ) || ( this.IsInIMEComposition ) )
-        return;
-
-      object value;
-      bool hasParsingError;
-
-      if( this.IsTextReadyToBeParsed )
-      {
-        string parsableText = this.GetParsableText();
-
-        value = this.GetValueFromText( parsableText, out hasParsingError );
-
-        if( this.IsValueNull( value ) )
-          value = this.NullValue;
-      }
-      else
-      {
-        // We don't consider empty text as a parsing error.
-        hasParsingError = !this.GetIsEditTextEmpty();
-        value = this.NullValue;
-      }
-
-      this.SetHasParsingError( hasParsingError );
-
-      bool hasValidationError = hasParsingError;
-      try
-      {
-        this.ValidateValue( value );
-
-        this.SetIsValueOutOfRange( false );
-      }
-      catch( Exception exception )
-      {
-        hasValidationError = true;
-
-        if( this.BeepOnError )
-        {
-          System.Media.SystemSounds.Beep.Play();
-        }
-
-        if( exception is ArgumentOutOfRangeException )
-          this.SetIsValueOutOfRange( true );
-
-        value = this.NullValue;
-      }
-
-      if( !object.Equals( value, this.Value ) )
-        this.ForceValue( value );
-
-      this.SetHasValidationError( hasValidationError );
-    }
-
-    internal virtual bool GetIsEditTextEmpty()
-    {
-      return this.Text == string.Empty;
-    }
-
-    private static object ConvertValueToDataType( object value, Type type )
-    {
-      // We use InvariantCulture instead of the active format provider since the FormatProvider is only
-      // used when the source type is String.  When we are converting from a string, we are
-      // actually converting a value from XAML.  Therefore, if the string will have a period as a
-      // decimal separator.  If we were using the active format provider, we could end up expecting a coma
-      // as the decimal separator and the ChangeType method would throw.
-      if( type == null )
-        return null;
-
-      if( ( ( value != null ) && ( value != DBNull.Value ) )
-        && ( value.GetType() != type ) )
-      {
-        return ChangeTypeHelper.ChangeType( value, type, CultureInfo.InvariantCulture );
-      }
-
-      return value;
-    }
-
-    private void CanEnterLineBreak( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = false;
-      e.Handled = true;
-    }
-
-    private void CanEnterParagraphBreak( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = false;
-      e.Handled = true;
-    }
-
-    private void ValidateValueInRange( object minValue, object maxValue, object value )
-    {
-      if( this.IsValueNull( value ) )
-        return;
-
-      Type type = this.ValueDataType;
-      if( type.IsGenericType && type.GetGenericTypeDefinition().Equals( typeof( Nullable<> ) ) )
-      {
-        NullableConverter nullableConverter = new NullableConverter( type );
-        type = nullableConverter.UnderlyingType;
-      }
-
-      if( value.GetType() != type )
-        value = System.Convert.ChangeType( value, type );
-
-      // Validate the value against the range.
-      if( minValue != null )
-      {
-        IComparable minValueComparable = ( IComparable )minValue;
-
-        if( ( maxValue != null ) && ( minValueComparable.CompareTo( maxValue ) > 0 ) )
-          throw new ArgumentOutOfRangeException( "minValue", "MaxValue must be greater than MinValue." );
-
-        if( minValueComparable.CompareTo( value ) > 0 )
-          throw new ArgumentOutOfRangeException( "minValue", "Value must be greater than MinValue." );
-      }
-
-      if( maxValue != null )
-      {
-        IComparable maxValueComparable = ( IComparable )maxValue;
-
-        if( maxValueComparable.CompareTo( value ) < 0 )
-          throw new ArgumentOutOfRangeException( "maxValue", "Value must be less than MaxValue." );
-      }
-    }
-
-    #region ISupportInitialize
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      this.IsFinalizingInitialization = true;
-      try
-      {
-        this.CoerceValue( ValueRangeTextBox.ValueDataTypeProperty );
-
-        this.IsNumericValueDataType = ValueRangeTextBox.IsNumericType( this.ValueDataType );
-        this.RefreshConversionHelpers();
-
-        this.CoerceValue( ValueRangeTextBox.MinValueProperty );
-        this.CoerceValue( ValueRangeTextBox.MaxValueProperty );
-
-        this.CoerceValue( ValueRangeTextBox.ValueProperty );
-
-        this.CoerceValue( ValueRangeTextBox.NullValueProperty );
-
-        this.CoerceValue( ValueRangeTextBox.TextProperty );
-      }
-      catch( Exception exception )
-      {
-        throw new InvalidOperationException( "Initialization of the ValueRangeTextBox failed.", exception );
-      }
-      finally
-      {
-        this.IsFinalizingInitialization = false;
-      }
-
-      base.OnInitialized( e );
-    }
-
-    #endregion ISupportInitialize
-
-    private BitVector32 m_flags;
-    private CachedTextInfo m_imePreCompositionCachedTextInfo;
-
-    [Flags]
-    private enum ValueRangeTextBoxFlags
-    {
-      IsFinalizingInitialization = 1,
-      IsForcingText = 2,
-      IsForcingValue = 4,
-      IsInValueChanged = 8,
-      IsNumericValueDataType = 16
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
deleted file mode 100644
index ee4ad3b4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
+++ /dev/null
@@ -1,451 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows;
-using System.ComponentModel;
-using System.Windows.Input;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public class WindowContainer : Canvas
-  {
-    #region Constructors
-
-    static WindowContainer()
-    {
-      // The default background must be transparent in order to be able to trap
-      // all mouse events when a modal window is displayed.
-      var defaultModalBackgroundBrush = new SolidColorBrush( Colors.Transparent );
-      defaultModalBackgroundBrush.Freeze();
-      ModalBackgroundBrushProperty = DependencyProperty.Register( "ModalBackgroundBrush", typeof( Brush ), typeof( WindowContainer ), new UIPropertyMetadata( defaultModalBackgroundBrush, OnModalBackgroundBrushChanged ) );
-    }
-
-
-    public WindowContainer()
-    {
-      this.SizeChanged += new SizeChangedEventHandler( this.WindowContainer_SizeChanged );
-      this.LayoutUpdated += new EventHandler( this.WindowContainer_LayoutUpdated );
-      this.Loaded += new RoutedEventHandler( WindowContainer_Loaded );
-      this.ClipToBounds = true;
-    }
-
-    void WindowContainer_Loaded( object sender, RoutedEventArgs e )
-    {
-      foreach( WindowControl window in this.Children )
-      {
-        window.SetIsActiveInternal( false );
-      }
-      this.SetNextActiveWindow( null );
-    }
-
-    #endregion //Constructors
-
-    #region Members
-
-    private Brush _defaultBackgroundBrush;
-    private bool _isModalBackgroundApplied;
-
-    #endregion
-
-    #region Properties
-
-    #region ModalBackgroundBrush
-
-    /// <summary>
-    /// Identifies the ModalBackgroundBrush dependency property.
-    /// </summary>
-    // Initialized in the static constructor.
-    public static readonly DependencyProperty ModalBackgroundBrushProperty;
-
-    /// <summary>
-    /// When using a modal window in the WindowContainer, a ModalBackgroundBrush can be set
-    /// for the WindowContainer.
-    /// </summary>
-    public Brush ModalBackgroundBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( ModalBackgroundBrushProperty );
-      }
-      set
-      {
-        SetValue( ModalBackgroundBrushProperty, value );
-      }
-    }
-
-    private static void OnModalBackgroundBrushChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      WindowContainer windowContainer = ( WindowContainer )d;
-      if( windowContainer != null )
-        windowContainer.OnModalBackgroundBrushChanged( ( Brush )e.OldValue, ( Brush )e.NewValue );
-    }
-
-    protected virtual void OnModalBackgroundBrushChanged( Brush oldValue, Brush newValue )
-    {
-      this.SetModalBackground();
-    }
-
-    #endregion //ModalBackgroundBrush
-
-    #endregion
-
-    #region Base Class Override
-
-    /// <summary>
-    /// Measure the size of the WindowContainer based on its children.
-    /// </summary>
-    protected override Size MeasureOverride( Size constraint )
-    {
-      Size size = base.MeasureOverride( constraint );
-
-      if( this.Children.Count > 0 )
-      {
-        double width = double.IsNaN( this.Width )
-                        ? this.Children.OfType<WindowControl>().Max( ( w ) => w.Left + w.DesiredSize.Width )
-                        : this.Width;
-        double height = double.IsNaN( this.Height )
-                        ? this.Children.OfType<WindowControl>().Max( ( w ) => w.Top + w.DesiredSize.Height )
-                        : this.Height;
-        return new Size( Math.Min( width, constraint.Width), Math.Min( height, constraint.Height) );
-      }
-
-      return size;
-    }
-
-    /// <summary>
-    /// Register and unregister to children events.
-    /// </summary>
-    protected override void OnVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      base.OnVisualChildrenChanged( visualAdded, visualRemoved );
-
-      if( visualAdded != null && !( visualAdded is WindowControl ) )
-        throw new InvalidOperationException( "WindowContainer can only contain WindowControl types." );
-
-      if( visualRemoved != null )
-      {
-        WindowControl removedChild = ( WindowControl )visualRemoved;
-        removedChild.LeftChanged -= new EventHandler<EventArgs>( this.Child_LeftChanged );
-        removedChild.TopChanged -= new EventHandler<EventArgs>( this.Child_TopChanged );
-        removedChild.PreviewMouseLeftButtonDown -= new MouseButtonEventHandler( this.Child_PreviewMouseLeftButtonDown );
-        removedChild.IsVisibleChanged -= new DependencyPropertyChangedEventHandler( this.Child_IsVisibleChanged );
-        removedChild.IsKeyboardFocusWithinChanged -= new DependencyPropertyChangedEventHandler( this.Child_IsKeyboardFocusWithinChanged );
-        if( removedChild is ChildWindow )
-        {
-          ( ( ChildWindow )removedChild ).IsModalChanged -= new EventHandler<EventArgs>( this.Child_IsModalChanged );
-        }
-      }
-
-      if( visualAdded != null )
-      {
-        WindowControl addedChild = ( WindowControl )visualAdded;
-        addedChild.LeftChanged += new EventHandler<EventArgs>( this.Child_LeftChanged );
-        addedChild.TopChanged += new EventHandler<EventArgs>( this.Child_TopChanged );
-        addedChild.PreviewMouseLeftButtonDown += new MouseButtonEventHandler( this.Child_PreviewMouseLeftButtonDown );
-        addedChild.IsVisibleChanged += new DependencyPropertyChangedEventHandler( this.Child_IsVisibleChanged );
-        addedChild.IsKeyboardFocusWithinChanged += new DependencyPropertyChangedEventHandler( this.Child_IsKeyboardFocusWithinChanged );
-        if( addedChild is ChildWindow )
-        {
-          ( ( ChildWindow )addedChild ).IsModalChanged += new EventHandler<EventArgs>( this.Child_IsModalChanged );
-        }
-      }
-    }
-
-    #endregion
-
-    #region Event Handler
-
-
-
-
-
-    private void Child_LeftChanged( object sender, EventArgs e )
-    {
-      WindowControl windowControl = ( WindowControl )sender;
-      if( windowControl != null )
-      {
-        windowControl.Left = this.GetRestrictedLeft( windowControl );
-      }
-
-      Canvas.SetLeft( windowControl, windowControl.Left );
-    }
-
-    private void Child_TopChanged( object sender, EventArgs e )
-    {
-      WindowControl windowControl = ( WindowControl )sender;
-      if( windowControl != null )
-      {
-        windowControl.Top = this.GetRestrictedTop( windowControl );
-      }
-
-      Canvas.SetTop( windowControl, windowControl.Top );
-    }
-
-    private void Child_PreviewMouseLeftButtonDown( object sender, RoutedEventArgs e )
-    {
-      WindowControl windowControl = ( WindowControl )sender;
-
-      WindowControl modalWindow = this.GetModalWindow();
-      if( modalWindow == null )
-      {
-        this.SetNextActiveWindow( windowControl );
-      }
-    }
-
-    private void Child_IsModalChanged( object sender, EventArgs e )
-    {
-      this.SetModalBackground();
-    }
-
-    private void Child_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      WindowControl windowControl = ( WindowControl )sender;
-
-      //Do not give access to data behind the WindowContainer as long as any child of WindowContainer is visible.
-      WindowControl firstVisibleChild = this.Children.OfType<WindowControl>().FirstOrDefault( ( x ) => x.Visibility == Visibility.Visible );
-      this.IsHitTestVisible = ( firstVisibleChild != null );
-
-      if( ( bool )e.NewValue )
-      {
-        this.SetChildPos( windowControl );
-        this.SetNextActiveWindow( windowControl );
-      }
-      else
-      {
-        this.SetNextActiveWindow( null );
-      }
-
-      WindowControl modalWindow = this.GetModalWindow();
-      foreach( WindowControl window in this.Children )
-      {
-        window.IsBlockMouseInputsPanelActive = ( modalWindow != null ) && !object.Equals( modalWindow, window );
-      }
-
-      this.SetModalBackground();
-    }
-
-    private void Child_IsKeyboardFocusWithinChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      WindowControl windowControl = ( WindowControl )sender;
-      if( ( bool )e.NewValue )
-      {
-        this.SetNextActiveWindow( windowControl );
-      }
-    }
-
-    private void WindowContainer_LayoutUpdated( object sender, EventArgs e )
-    {
-      foreach( WindowControl windowControl in this.Children )
-      {
-        //we only want to set the start position if this is the first time the control has bee initialized
-        if( !windowControl.IsStartupPositionInitialized && ( windowControl.ActualWidth != 0 ) && ( windowControl.ActualHeight != 0 ) )
-        {
-          this.SetChildPos( windowControl );
-          windowControl.IsStartupPositionInitialized = true;
-        }
-      }
-    }
-
-    private void WindowContainer_SizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      foreach( WindowControl windowControl in this.Children )
-      {
-          //reposition our windows
-          windowControl.Left = this.GetRestrictedLeft( windowControl );
-          windowControl.Top = this.GetRestrictedTop( windowControl );
-      }
-    }
-
-    private void ExpandWindowControl( WindowControl windowControl )
-    {
-      if( windowControl != null )
-      {
-        windowControl.Left = 0;
-        windowControl.Top = 0;
-        windowControl.Width = Math.Min( this.ActualWidth, windowControl.MaxWidth );
-        windowControl.Height = Math.Min( this.ActualHeight, windowControl.MaxHeight );
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void SetChildPos( WindowControl windowControl )
-    {
-      // A MessageBox with no X and Y will be centered.
-      // A ChildWindow with WindowStartupLocation == Center will be centered.
-      if( ( ( windowControl is MessageBox ) && ( windowControl.Left == 0 ) && ( windowControl.Top == 0 ) )
-        || ( ( windowControl is ChildWindow ) && ( ( ( ChildWindow )windowControl ).WindowStartupLocation == WindowStartupLocation.Center ) ) )
-      {
-        this.CenterChild( windowControl );
-      }
-      else
-      {
-        Canvas.SetLeft( windowControl, windowControl.Left );
-        Canvas.SetTop( windowControl, windowControl.Top );
-      }
-    }
-
-    private void CenterChild( WindowControl windowControl )
-    {
-      windowControl.UpdateLayout();
-
-      if( ( windowControl.ActualWidth != 0 ) && ( windowControl.ActualHeight != 0 ) )
-      {
-        windowControl.Left = ( this.ActualWidth - windowControl.ActualWidth ) / 2.0;
-        windowControl.Left += (windowControl.Margin.Left - windowControl.Margin.Right);
-        windowControl.Top = ( this.ActualHeight - windowControl.ActualHeight ) / 2.0;
-        windowControl.Top += ( windowControl.Margin.Top - windowControl.Margin.Bottom );
-      }
-    }
-
-    private void SetNextActiveWindow( WindowControl windowControl )
-    {
-      if( !this.IsLoaded )
-        return;
-
-      if( this.IsModalWindow( windowControl ) )
-      {
-        this.BringToFront( windowControl );
-      }
-      else
-      {
-        WindowControl modalWindow = this.GetModalWindow();
-        // Modal window is always in front
-        if( modalWindow != null )
-        {
-          this.BringToFront( modalWindow );
-        }
-        else if( windowControl != null )
-        {
-          this.BringToFront( windowControl );
-        }
-        else
-        {
-          this.BringToFront( this.Children.OfType<WindowControl>()
-                            .OrderByDescending( ( x ) => Canvas.GetZIndex( x ) )
-                            .FirstOrDefault( ( x ) => x.Visibility == Visibility.Visible ) );
-        }
-      }
-    }
-
-    private void BringToFront( WindowControl windowControl )
-    {
-      if( windowControl != null )
-      {
-        int maxZIndez = this.Children.OfType<WindowControl>().Max( ( x ) => Canvas.GetZIndex( x ) );
-        Canvas.SetZIndex( windowControl, maxZIndez + 1 );
-
-        this.SetActiveWindow( windowControl );
-      }
-    }
-
-    private void SetActiveWindow( WindowControl windowControl )
-    {
-      if( windowControl.IsActive )
-        return;
-
-      foreach( WindowControl window in this.Children )
-      {
-        window.SetIsActiveInternal( false );
-      }
-      windowControl.SetIsActiveInternal( true );
-    }
-
-    private bool IsModalWindow( WindowControl windowControl )
-    {
-      return ( ( ( windowControl is MessageBox ) && (windowControl.Visibility == Visibility.Visible) )
-             || ( ( windowControl is ChildWindow ) && ( ( ChildWindow )windowControl ).IsModal && ( ( ChildWindow )windowControl).WindowState == WindowState.Open ) );
-    }
-
-    private WindowControl GetModalWindow()
-    {
-      return this.Children.OfType<WindowControl>()
-                      .OrderByDescending( ( x ) => Canvas.GetZIndex( x ) )
-                      .FirstOrDefault( ( x ) => IsModalWindow( x ) && (x.Visibility == Visibility.Visible) );
-    }
-
-    private double GetRestrictedLeft( WindowControl windowControl )
-    {
-      if( windowControl.Left < 0 )
-        return 0;
-
-      if( ( ( windowControl.Left + windowControl.ActualWidth ) > this.ActualWidth ) && ( this.ActualWidth != 0 ) )
-      {
-        double x = this.ActualWidth - windowControl.ActualWidth;
-        return x < 0 ? 0 : x;
-      }
-
-      return windowControl.Left;
-    }
-
-    private double GetRestrictedTop( WindowControl windowControl )
-    {
-      if( windowControl.Top < 0 )
-        return 0;
-
-      if( ( ( windowControl.Top + windowControl.ActualHeight ) > this.ActualHeight ) && ( this.ActualHeight != 0 ) )
-      {
-        double y = this.ActualHeight - windowControl.ActualHeight;
-        return y < 0 ? 0 : y;
-      }
-
-      return windowControl.Top;
-    }
-
-    private void SetModalBackground()
-    {
-      // We have a modal window and a ModalBackgroundBrush set.
-      if( ( this.GetModalWindow() != null ) && ( this.ModalBackgroundBrush != null ) )
-      {
-        if( !_isModalBackgroundApplied )
-        {
-          _defaultBackgroundBrush = this.Background;
-          _isModalBackgroundApplied = true;
-        }
-
-        this.Background = this.ModalBackgroundBrush;
-
-      }
-      else
-      {
-        if( _isModalBackgroundApplied )
-        {
-          this.Background = _defaultBackgroundBrush;
-          _defaultBackgroundBrush = null;
-          _isModalBackgroundApplied = false;
-        }
-      }
-    }
-
-
-
-
-
-    #endregion
-  }
-
-
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
deleted file mode 100644
index cd0553b0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
+++ /dev/null
@@ -1,870 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.IO;
-using Xceed.Wpf.Toolkit.Core;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  [TemplatePart( Name = PART_HeaderThumb, Type = typeof( Thumb ) )]
-  [TemplatePart( Name = PART_Icon, Type = typeof( Image ) )]
-  [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )]  
-  [TemplatePart( Name = PART_ToolWindowCloseButton, Type = typeof( Button ) )]
-  [TemplatePart( Name = PART_BlockMouseInputsBorder, Type = typeof( Border ) )]
-  [TemplatePart( Name = PART_HeaderGrid, Type = typeof( Grid ) )]
-  public class WindowControl : ContentControl
-  {
-    public static readonly ComponentResourceKey DefaultCloseButtonStyleKey = new ComponentResourceKey( typeof( WindowControl ), "DefaultCloseButtonStyle" );
-
-    private const string PART_HeaderThumb = "PART_HeaderThumb";
-    private const string PART_Icon = "PART_Icon";
-    private const string PART_CloseButton = "PART_CloseButton";
-    private const string PART_ToolWindowCloseButton = "PART_ToolWindowCloseButton";
-    private const string PART_BlockMouseInputsBorder = "PART_BlockMouseInputsBorder";
-    private const string PART_HeaderGrid = "PART_HeaderGrid";
-
-    #region Members
-
-    private Thumb _headerThumb;
-    private Image _icon;
-    private Button _closeButton;
-    private Button _windowToolboxCloseButton;
-    private bool _setIsActiveInternal;
-    internal Border _windowBlockMouseInputsPanel;
-
-    #endregion
-
-    #region Constructors
-
-    static WindowControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( WindowControl ), new FrameworkPropertyMetadata( typeof( WindowControl ) ) );
-    }
-
-    public WindowControl()
-    {
-
-    }
-
-    #endregion //Constructors
-
-    #region Dependency Properties
-
-    #region Public DP
-
-    #region Caption
-
-    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( string ), typeof( WindowControl ), new UIPropertyMetadata( String.Empty ) );
-    public string Caption
-    {
-      get
-      {
-        return ( string )GetValue( CaptionProperty );
-      }
-      set
-      {
-        SetValue( CaptionProperty, value );
-      }
-    }
-
-    #endregion //Caption
-
-    #region CaptionFontSize
-
-    public static readonly DependencyProperty CaptionFontSizeProperty = DependencyProperty.Register( "CaptionFontSize", typeof( double ), typeof( WindowControl ), new UIPropertyMetadata( 15d ) );
-    public double CaptionFontSize
-    {
-      get
-      {
-        return (double)GetValue( CaptionFontSizeProperty );
-      }
-      set
-      {
-        SetValue( CaptionFontSizeProperty, value );
-      }
-    }
-
-    #endregion //CaptionFontSize
-
-    #region CaptionForeground
-
-    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( WindowControl ), new UIPropertyMetadata( null ) );
-    public Brush CaptionForeground
-    {
-      get
-      {
-        return ( Brush )GetValue( CaptionForegroundProperty );
-      }
-      set
-      {
-        SetValue( CaptionForegroundProperty, value );
-      }
-    }
-
-    #endregion //CaptionForeground
-
-    #region CaptionShadowBrush
-
-    public static readonly DependencyProperty CaptionShadowBrushProperty = DependencyProperty.Register( "CaptionShadowBrush", typeof( Brush ), typeof( WindowControl ), new UIPropertyMetadata( new SolidColorBrush( Color.FromArgb( 179, 255, 255, 255 ) ) ) );
-    public Brush CaptionShadowBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( CaptionShadowBrushProperty );
-      }
-      set
-      {
-        SetValue( CaptionShadowBrushProperty, value );
-      }
-    }
-
-    #endregion //CaptionShadowBrush
-
-    #region CaptionIcon
-
-    public static readonly DependencyProperty CaptionIconProperty = DependencyProperty.Register( "CaptionIcon", typeof( ImageSource ), typeof( WindowControl ), new UIPropertyMetadata( null ) );
-    public ImageSource CaptionIcon
-    {
-      get
-      {
-        return ( ImageSource )GetValue( CaptionIconProperty );
-      }
-      set
-      {
-        SetValue( CaptionIconProperty, value );
-      }
-    }
-
-    #endregion //CaptionIcon
-
-    #region CloseButtonStyle
-
-    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( WindowControl ), new UIPropertyMetadata( null ) );
-    public Style CloseButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( CloseButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( CloseButtonStyleProperty, value );
-      }
-    }
-
-    #endregion //CloseButtonStyle
-
-    #region CloseButtonVisibility
-
-    public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register( "CloseButtonVisibility", typeof( Visibility ), typeof( WindowControl ), new PropertyMetadata( Visibility.Visible, null, OnCoerceCloseButtonVisibility ) );
-    public Visibility CloseButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( CloseButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( CloseButtonVisibilityProperty, value );
-      }
-    }
-
-    private static object OnCoerceCloseButtonVisibility( DependencyObject d, object basevalue )
-    {
-      if( basevalue == DependencyProperty.UnsetValue )
-        return basevalue;
-
-      WindowControl windowControl = d as WindowControl;
-      if( windowControl == null )
-        return basevalue;
-      return windowControl.OnCoerceCloseButtonVisibility( ( Visibility )basevalue );
-    }
-
-    protected virtual object OnCoerceCloseButtonVisibility( Visibility newValue )
-    {
-      return newValue;
-    }
-
-    #endregion //CloseButtonVisibility
-
-    #region IsActive
-
-    public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register( "IsActive", typeof( bool ), typeof( WindowControl ), new UIPropertyMetadata( true, OnIsActiveChanged, OnCoerceIsActive ) );
-    public bool IsActive
-    {
-      get
-      {
-        return ( bool )GetValue( IsActiveProperty );
-      }
-      set
-      {
-        SetValue( IsActiveProperty, value );
-      }
-    }
-
-    private static object OnCoerceIsActive( DependencyObject d, object basevalue )
-    {
-      WindowControl w = d as WindowControl;
-      if( w != null && !w._setIsActiveInternal && !w.AllowPublicIsActiveChange )
-        throw new InvalidOperationException( "Cannot set IsActive directly. This is handled by the underlying system" );
-
-      return basevalue;
-    }
-
-    private static void OnIsActiveChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
-    {
-      var windowControl = obj as WindowControl;
-      if( windowControl != null )
-        windowControl.OnIsActiveChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsActiveChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-      {
-        if( this.GetType() == typeof( WindowControl ) )
-        {
-          this.RaiseEvent( new RoutedEventArgs( ActivatedEvent, this ) );
-        }
-      }
-    }
-
-    internal void SetIsActiveInternal( bool isActive )
-    {
-      _setIsActiveInternal = true;
-      this.IsActive = isActive;
-      _setIsActiveInternal = false;
-    }
-
-    #endregion //IsActive
-
-
-
-
-
-
-
-
-
-    #region Left
-
-    public static readonly DependencyProperty LeftProperty = DependencyProperty.Register( "Left", typeof( double ), typeof( WindowControl ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnLeftPropertyChanged ), OnCoerceLeft ) );
-    public double Left
-    {
-      get
-      {
-        return ( double )GetValue( LeftProperty );
-      }
-      set
-      {
-        SetValue( LeftProperty, value );
-      }
-    }
-
-    private static object OnCoerceLeft( DependencyObject d, object basevalue )
-    {
-      if( basevalue == DependencyProperty.UnsetValue )
-        return basevalue;
-
-      var windowControl = ( WindowControl )d;
-      if( windowControl == null )
-        return basevalue;
-
-      return windowControl.OnCoerceLeft( basevalue );
-    }
-
-    private object OnCoerceLeft( object newValue )
-    {
-      var value = ( double )newValue;
-      if( object.Equals( value, double.NaN ) )
-        return 0.0;
-
-      return newValue;
-    }
-
-    private static void OnLeftPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
-    {
-      WindowControl windowControl = obj as WindowControl;
-      if( windowControl != null )
-        windowControl.OnLeftPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    internal event EventHandler<EventArgs> LeftChanged;
-
-    protected virtual void OnLeftPropertyChanged( double oldValue, double newValue )
-    {
-      EventHandler<EventArgs> handler = LeftChanged;
-      if( handler != null )
-      {
-        handler( this, EventArgs.Empty );
-      }
-    }
-
-    #endregion //Left
-
-    #region Top
-
-    public static readonly DependencyProperty TopProperty = DependencyProperty.Register( "Top", typeof( double ), typeof( WindowControl ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnTopPropertyChanged ), OnCoerceTop ) );
-    public double Top
-    {
-      get
-      {
-        return ( double )GetValue( TopProperty );
-      }
-      set
-      {
-        SetValue( TopProperty, value );
-      }
-    }
-
-    private static object OnCoerceTop( DependencyObject d, object basevalue )
-    {
-      if( basevalue == DependencyProperty.UnsetValue )
-        return basevalue;
-
-      var windowControl = ( WindowControl )d;
-      if( windowControl == null )
-        return basevalue;
-
-      return windowControl.OnCoerceTop( basevalue );
-    }
-
-    private object OnCoerceTop( object newValue )
-    {
-      var value = ( double )newValue;
-      if( object.Equals( value, double.NaN ) )
-        return 0.0;
-
-      return newValue;
-    }
-
-    private static void OnTopPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
-    {
-      WindowControl windowControl = obj as WindowControl;
-      if( windowControl != null )
-        windowControl.OnTopPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    internal event EventHandler<EventArgs> TopChanged;
-
-    protected virtual void OnTopPropertyChanged( double oldValue, double newValue )
-    {
-      EventHandler<EventArgs> handler = TopChanged;
-      if( handler != null )
-      {
-        handler( this, EventArgs.Empty );
-      }
-    }
-
-    #endregion //TopProperty
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    #region WindowBackground
-
-    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) );
-    public Brush WindowBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowBackgroundProperty );
-      }
-      set
-      {
-        SetValue( WindowBackgroundProperty, value );
-      }
-    }
-
-    #endregion // WindowBackground
-
-    #region WindowBorderBrush
-
-    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) );
-    public Brush WindowBorderBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowBorderBrushProperty );
-      }
-      set
-      {
-        SetValue( WindowBorderBrushProperty, value );
-      }
-    }
-
-    #endregion //WindowBorderBrush
-
-    #region WindowBorderThickness
-
-    public static readonly DependencyProperty WindowBorderThicknessProperty = DependencyProperty.Register( "WindowBorderThickness", typeof( Thickness ), typeof( WindowControl ), new PropertyMetadata( new Thickness( 0 ) ) );
-    public Thickness WindowBorderThickness
-    {
-      get
-      {
-        return ( Thickness )GetValue( WindowBorderThicknessProperty );
-      }
-      set
-      {
-        SetValue( WindowBorderThicknessProperty, value );
-      }
-    }
-
-    #endregion //WindowBorderThickness
-
-    #region WindowInactiveBackground
-
-    public static readonly DependencyProperty WindowInactiveBackgroundProperty = DependencyProperty.Register( "WindowInactiveBackground", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) );
-    public Brush WindowInactiveBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowInactiveBackgroundProperty );
-      }
-      set
-      {
-        SetValue( WindowInactiveBackgroundProperty, value );
-      }
-    }
-
-    #endregion // WindowInactiveBackground
-
-    #region WindowOpacity
-
-    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( WindowControl ), new PropertyMetadata( 1d ) );
-    public double WindowOpacity
-    {
-      get
-      {
-        return ( double )GetValue( WindowOpacityProperty );
-      }
-      set
-      {
-        SetValue( WindowOpacityProperty, value );
-      }
-    }
-
-    #endregion //WindowOpacity
-
-    #region WindowStyle
-
-    public static readonly DependencyProperty WindowStyleProperty = DependencyProperty.Register( "WindowStyle", typeof( WindowStyle ), typeof( WindowControl ), new PropertyMetadata( WindowStyle.SingleBorderWindow, null, OnCoerceWindowStyle ) );
-    public WindowStyle WindowStyle
-    {
-      get
-      {
-        return ( WindowStyle )GetValue( WindowStyleProperty );
-      }
-      set
-      {
-        SetValue( WindowStyleProperty, value );
-      }
-    }
-
-    private static object OnCoerceWindowStyle( DependencyObject d, object basevalue )
-    {
-      if( basevalue == DependencyProperty.UnsetValue )
-        return basevalue;
-
-      WindowControl windowControl = d as WindowControl;
-      if( windowControl == null )
-        return basevalue;
-      return windowControl.OnCoerceWindowStyle( ( WindowStyle )basevalue );
-    }
-
-    protected virtual object OnCoerceWindowStyle( WindowStyle newValue )
-    {
-      return newValue;
-    }
-
-    private static void OnWindowStyleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      WindowControl window = ( WindowControl )d;
-      if( window != null )
-        window.OnWindowStyleChanged( ( WindowStyle )e.OldValue, ( WindowStyle )e.NewValue );
-    }
-
-    protected virtual void OnWindowStyleChanged( WindowStyle oldValue, WindowStyle newValue )
-    {
-    }
-
-    #endregion //WindowStyle  
-
-    #region WindowThickness
-
-    public static readonly DependencyProperty WindowThicknessProperty = DependencyProperty.Register( "WindowThickness", typeof( Thickness ), typeof( WindowControl ),
-                                                                        new PropertyMetadata( new Thickness( SystemParameters.ResizeFrameVerticalBorderWidth - 3,
-                                                                                                            SystemParameters.ResizeFrameHorizontalBorderHeight - 3,
-                                                                                                            SystemParameters.ResizeFrameVerticalBorderWidth - 3,
-                                                                                                            SystemParameters.ResizeFrameHorizontalBorderHeight - 3 ) ) );
-    public Thickness WindowThickness
-    {
-      get
-      {
-        return ( Thickness )GetValue( WindowThicknessProperty );
-      }
-      set
-      {
-        SetValue( WindowThicknessProperty, value );
-      }
-    }
-
-    #endregion //WindowThickness
-
-    #endregion //Public DP
-
-    #endregion //Dependency Properties
-
-    #region Internal Properties
-
-    internal bool IsStartupPositionInitialized
-    {
-      get;
-      set;
-    }
-
-    #region IsBlockMouseInputsPanelActive (Internal)
-
-    internal bool IsBlockMouseInputsPanelActive
-    {
-      get
-      {
-        return _IsBlockMouseInputsPanelActive;
-      }
-      set
-      {
-        if( value != _IsBlockMouseInputsPanelActive )
-        {
-          _IsBlockMouseInputsPanelActive = value;         
-          this.UpdateBlockMouseInputsPanel();
-        }
-      }
-    }
-
-    private bool _IsBlockMouseInputsPanelActive;
-
-    #endregion
-
-    internal virtual bool AllowPublicIsActiveChange
-    {
-      get { return true; }
-    }
-
-
-    #endregion //Internal Properties
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _headerThumb != null )
-      {
-        _headerThumb.PreviewMouseLeftButtonDown -= new MouseButtonEventHandler( this.HeaderPreviewMouseLeftButtonDown );
-        _headerThumb.PreviewMouseRightButtonDown -= new MouseButtonEventHandler( this.HeaderPreviewMouseRightButtonDown );
-        _headerThumb.DragDelta -= new DragDeltaEventHandler( this.HeaderThumbDragDelta );
-      }
-      _headerThumb = this.Template.FindName( PART_HeaderThumb, this ) as Thumb;
-      if( _headerThumb != null )
-      {
-        _headerThumb.PreviewMouseLeftButtonDown += new MouseButtonEventHandler( this.HeaderPreviewMouseLeftButtonDown );
-        _headerThumb.PreviewMouseRightButtonDown += new MouseButtonEventHandler( this.HeaderPreviewMouseRightButtonDown );
-        _headerThumb.DragDelta += new DragDeltaEventHandler( this.HeaderThumbDragDelta );
-      }
-
-      if( _icon != null )
-      {
-        _icon.MouseLeftButtonDown -= new MouseButtonEventHandler( this.IconMouseLeftButtonDown );
-      }
-      _icon = this.Template.FindName( PART_Icon, this ) as Image;
-      if( _icon != null )
-      {
-        _icon.MouseLeftButtonDown += new MouseButtonEventHandler( this.IconMouseLeftButtonDown );
-      }
-
-      if( _closeButton != null )
-      {
-        _closeButton.Click -= new RoutedEventHandler( this.Close );
-      }
-      _closeButton = this.Template.FindName( PART_CloseButton, this ) as Button;
-      if( _closeButton != null )
-      {
-        _closeButton.Click += new RoutedEventHandler( this.Close );
-      }
-
-      if( _windowToolboxCloseButton != null )
-      {
-        _windowToolboxCloseButton.Click -= new RoutedEventHandler( this.Close );
-      }
-      _windowToolboxCloseButton = this.Template.FindName( PART_ToolWindowCloseButton, this ) as Button;
-      if( _windowToolboxCloseButton != null )
-      {
-        _windowToolboxCloseButton.Click += new RoutedEventHandler( this.Close );
-      }
-
-      _windowBlockMouseInputsPanel = this.Template.FindName( PART_BlockMouseInputsBorder, this ) as Border;
-      this.UpdateBlockMouseInputsPanel();
-
-
-
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Events
-
-    #region ActivatedEvent
-
-    public static readonly RoutedEvent ActivatedEvent = EventManager.RegisterRoutedEvent( "Activated", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( WindowControl ) );
-    public event RoutedEventHandler Activated
-    {
-      add
-      {
-        AddHandler( ActivatedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ActivatedEvent, value );
-      }
-    }
-
-    #endregion //ActivatedEvent
-
-    #region HeaderMouseLeftButtonClickedEvent
-
-    public static readonly RoutedEvent HeaderMouseLeftButtonClickedEvent = EventManager.RegisterRoutedEvent( "HeaderMouseLeftButtonClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
-    public event MouseButtonEventHandler HeaderMouseLeftButtonClicked
-    {
-      add
-      {
-        AddHandler( HeaderMouseLeftButtonClickedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( HeaderMouseLeftButtonClickedEvent, value );
-      }
-    }
-
-    #endregion //HeaderMouseLeftButtonClickedEvent
-
-    #region HeaderMouseRightButtonClickedEvent
-
-    public static readonly RoutedEvent HeaderMouseRightButtonClickedEvent = EventManager.RegisterRoutedEvent( "HeaderMouseRightButtonClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
-    public event MouseButtonEventHandler HeaderMouseRightButtonClicked
-    {
-      add
-      {
-        AddHandler( HeaderMouseRightButtonClickedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( HeaderMouseRightButtonClickedEvent, value );
-      }
-    }
-
-    #endregion //HeaderMouseRightButtonClickedEvent
-
-    #region HeaderMouseLeftButtonDoubleClickedEvent
-
-    public static readonly RoutedEvent HeaderMouseLeftButtonDoubleClickedEvent = EventManager.RegisterRoutedEvent( "HeaderMouseLeftButtonDoubleClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
-    public event MouseButtonEventHandler HeaderMouseLeftButtonDoubleClicked
-    {
-      add
-      {
-        AddHandler( HeaderMouseLeftButtonDoubleClickedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( HeaderMouseLeftButtonDoubleClickedEvent, value );
-      }
-    }
-
-    #endregion //HeaderMouseLeftButtonDoubleClickedEvent
-
-    #region HeaderDragDeltaEvent
-
-    public static readonly RoutedEvent HeaderDragDeltaEvent = EventManager.RegisterRoutedEvent( "HeaderDragDelta", RoutingStrategy.Bubble, typeof( DragDeltaEventHandler ), typeof( WindowControl ) );
-    public event DragDeltaEventHandler HeaderDragDelta
-    {
-      add
-      {
-        AddHandler( HeaderDragDeltaEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( HeaderDragDeltaEvent, value );
-      }
-    }
-
-    #endregion //HeaderDragDeltaEvent
-
-    #region HeaderIconClickedEvent
-
-    public static readonly RoutedEvent HeaderIconClickedEvent = EventManager.RegisterRoutedEvent( "HeaderIconClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
-    public event MouseButtonEventHandler HeaderIconClicked
-    {
-      add
-      {
-        AddHandler( HeaderIconClickedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( HeaderIconClickedEvent, value );
-      }
-    }
-
-    #endregion //HeaderIconClickedEvent
-
-    #region HeaderIconDoubleClickedEvent
-
-    public static readonly RoutedEvent HeaderIconDoubleClickedEvent = EventManager.RegisterRoutedEvent( "HeaderIconDoubleClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
-    public event MouseButtonEventHandler HeaderIconDoubleClicked
-    {
-      add
-      {
-        AddHandler( HeaderIconDoubleClickedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( HeaderIconDoubleClickedEvent, value );
-      }
-    }
-
-    #endregion //HeaderIconDoubleClickedEvent
-
-    #region CloseButtonClickedEvent
-
-    public static readonly RoutedEvent CloseButtonClickedEvent = EventManager.RegisterRoutedEvent( "CloseButtonClicked", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( WindowControl ) );
-    public event RoutedEventHandler CloseButtonClicked
-    {
-      add
-      {
-        AddHandler( CloseButtonClickedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( CloseButtonClickedEvent, value );
-      }
-    }
-
-    #endregion //CloseButtonClickedEvent
-
-
-
-
-
-
-
-
-
-
-    #endregion //Events
-
-    #region Event Handler
-
-    private void HeaderPreviewMouseLeftButtonDown( object sender, MouseButtonEventArgs e )
-    {
-
-      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
-      args.RoutedEvent = ( e.ClickCount == 2 ) ? HeaderMouseLeftButtonDoubleClickedEvent : HeaderMouseLeftButtonClickedEvent;
-      args.Source = this;
-      this.RaiseEvent( args );
-    }
-
-    private void HeaderPreviewMouseRightButtonDown( object sender, MouseButtonEventArgs e )
-    {
-      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Right );
-      args.RoutedEvent = HeaderMouseRightButtonClickedEvent;
-      args.Source = this;
-      this.RaiseEvent( args );
-    }
-
-    private void HeaderThumbDragDelta( object sender, DragDeltaEventArgs e )
-    {
-      DragDeltaEventArgs args = new DragDeltaEventArgs( e.HorizontalChange, e.VerticalChange );
-      args.RoutedEvent = HeaderDragDeltaEvent;
-      args.Source = this;
-      this.RaiseEvent( args );
-    }
-
-    private void IconMouseLeftButtonDown( object sender, MouseButtonEventArgs e )
-    {
-      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
-      args.RoutedEvent = ( e.ClickCount == 2 ) ? HeaderIconDoubleClickedEvent : HeaderIconClickedEvent;
-      args.Source = this;
-      this.RaiseEvent( args );
-    }
-
-    private void Close( object sender, RoutedEventArgs e )
-    {
-      this.RaiseEvent( new RoutedEventArgs( CloseButtonClickedEvent, this ) );
-    }
-
-
-
-
-    #endregion // Event Handler
-
-    #region Internal Methods
-
-    internal virtual void UpdateBlockMouseInputsPanel()
-    {
-      if( _windowBlockMouseInputsPanel != null )
-      {
-        _windowBlockMouseInputsPanel.Visibility = this.IsBlockMouseInputsPanelActive ? Visibility.Visible : Visibility.Collapsed;
-      }
-    }
-
-    internal double GetHeaderHeight()
-    {
-      Grid headerGrid = this.Template.FindName( PART_HeaderGrid, this ) as Grid;
-      if( headerGrid != null )
-        return headerGrid.ActualHeight;
-      return 0;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-
-    #endregion //Private Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
deleted file mode 100644
index e2c7d4b1..00000000
--- a/ExtendedWPFToolkitSolution_35/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_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png
deleted file mode 100644
index 0146e932..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png
deleted file mode 100644
index 51510df8..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png
deleted file mode 100644
index aeaeab8d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png
deleted file mode 100644
index 0f523fbd..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png
deleted file mode 100644
index 7dd3b491..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png
deleted file mode 100644
index ec521dd4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png
deleted file mode 100644
index 7275c981..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png
deleted file mode 100644
index b3138ba3..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png
deleted file mode 100644
index 7a6005d6..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs
deleted file mode 100644
index fff07349..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
-{
-  [AttributeUsage( AttributeTargets.Class, AllowMultiple = true )]
-  public class CategoryOrderAttribute : Attribute
-  {
-    #region Properties
-
-    #region Order
-
-    public int Order
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region Category
-
-    public virtual string Category
-    {
-      get
-      {
-        return CategoryValue;
-      }
-    }
-
-    #endregion
-
-    #region CategoryValue
-
-    public string CategoryValue
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #endregion
-
-    #region constructor
-
-    public CategoryOrderAttribute()
-    {
-    }
-
-    public CategoryOrderAttribute( string categoryName, int order )
-      :this()
-    {
-      CategoryValue = categoryName;
-      Order = order;
-    }
-
-    #endregion
-  }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
deleted file mode 100644
index c1fbbe54..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
-{
-  public class ExpandableObjectAttribute : Attribute
-  {
-    #region Constructors
-
-    public ExpandableObjectAttribute()
-    {
-    }
-
-
-    #endregion
-
-    #region Properties
-
-
-
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
deleted file mode 100644
index 512685fc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Collections.Generic;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
-{
-  public interface IItemsSource
-  {
-    ItemCollection GetValues();
-  }
-
-  public class Item
-  {
-    public string DisplayName
-    {
-      get;
-      set;
-    }
-    public object Value
-    {
-      get;
-      set;
-    }
-  }
-
-  public class ItemCollection : List<Item>
-  {
-    public void Add( object value )
-    {
-      Item item = new Item();
-      item.DisplayName = value.ToString();
-      item.Value = value;
-      base.Add( item );
-    }
-
-    public void Add( object value, string displayName )
-    {
-      Item newItem = new Item();
-      newItem.DisplayName = displayName;
-      newItem.Value = value;
-      base.Add( newItem );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
deleted file mode 100644
index 420ce78e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
-{
-  public class ItemsSourceAttribute : Attribute
-  {
-    public Type Type
-    {
-      get;
-      set;
-    }
-
-    public ItemsSourceAttribute( Type type )
-    {
-      var valueSourceInterface = type.GetInterface( typeof( IItemsSource ).FullName );
-      if( valueSourceInterface == null )
-        throw new ArgumentException( "Type must implement the IItemsSource interface.", "type" );
-
-      Type = type;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
deleted file mode 100644
index 0c1179d9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
-{
-  /// <summary>
-  /// This attribute can decorate the collection properties (i.e., IList) 
-  /// of your selected object in order to control the types that will be allowed
-  /// to be instantiated in the CollectionControl.
-  /// </summary>
-  [AttributeUsage( AttributeTargets.Property, AllowMultiple = false, Inherited = true )]
-  public class NewItemTypesAttribute : Attribute
-  {
-    public IList<Type> Types
-    {
-      get;
-      set;
-    }
-
-    public NewItemTypesAttribute( params Type[] types )
-    {
-      this.Types = new List<Type>( types );
-    }
-
-    public NewItemTypesAttribute()
-    {
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
deleted file mode 100644
index 217ef2dc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
-{
-  public enum UsageContextEnum
-  {
-    Alphabetical,
-    Categorized,
-    Both
-  }
-
-  [AttributeUsage( AttributeTargets.Property, AllowMultiple = true, Inherited = true )]
-  public class PropertyOrderAttribute : Attribute
-  {
-    #region Properties
-
-    public int Order
-    {
-      get;
-      set;
-    }
-
-    public UsageContextEnum UsageContext
-    {
-      get;
-      set;
-    }
-
-    public override object TypeId
-    {
-      get
-      {
-        return this;
-      }
-    }
-
-    #endregion
-
-    #region Initialization
-
-    public PropertyOrderAttribute( int order )
-      : this( order, UsageContextEnum.Both )
-    {
-    }
-
-    public PropertyOrderAttribute( int order, UsageContextEnum usageContext )
-    {
-      Order = order;
-      UsageContext = usageContext;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs
deleted file mode 100644
index 7e553265..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class CategoryGroupStyleSelector : StyleSelector
-  {
-    public Style SingleDefaultCategoryItemGroupStyle
-    {
-      get;
-      set;
-    }
-    public Style ItemGroupStyle
-    {
-      get;
-      set;
-    }
-
-    public override Style SelectStyle( object item, DependencyObject container )
-    {
-      var group = item as CollectionViewGroup;
-      // Category is not "Misc" => use regular ItemGroupStyle
-      if( (group.Name != null) && !group.Name.Equals( CategoryAttribute.Default.Category ) )
-        return this.ItemGroupStyle;
-
-      // Category is "Misc"
-      while( container != null )
-      {
-        container = VisualTreeHelper.GetParent( container );
-        if( container is ItemsControl )
-          break;
-      }
-
-      var itemsControl = container as ItemsControl;
-      if( itemsControl != null )
-      {
-        // Category is "Misc" and this is the only category => use SingleDefaultCategoryItemGroupContainerStyle
-        if( (itemsControl.Items.Count > 0) && (itemsControl.Items.Groups.Count == 1) )
-          return this.SingleDefaultCategoryItemGroupStyle;
-      }
-
-      // Category is "Misc" and this is NOT the only category => use regular ItemGroupStyle
-      return this.ItemGroupStyle;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
deleted file mode 100644
index b7ecb93a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Commands
-{
-  public class PropertyGridCommands
-  {
-    private static RoutedCommand _clearFilterCommand = new RoutedCommand();
-    public static RoutedCommand ClearFilter
-    {
-      get
-      {
-        return _clearFilterCommand;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
deleted file mode 100644
index c6ef6598..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Commands
-{
-  public static class PropertyItemCommands
-  {
-    private static RoutedCommand _resetValueCommand = new RoutedCommand();
-    public static RoutedCommand ResetValue
-    {
-      get
-      {
-        return _resetValueCommand;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
deleted file mode 100644
index 7e656da3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-using System.ComponentModel;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Globalization;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal class CommonPropertyExceptionValidationRule : ValidationRule
-  {
-    private TypeConverter _propertyTypeConverter;
-    private Type _type;
-
-    internal CommonPropertyExceptionValidationRule( Type type )
-    {
-      _propertyTypeConverter = TypeDescriptor.GetConverter( type );
-      _type = type;
-    }
-
-    public override ValidationResult Validate( object value, CultureInfo cultureInfo )
-    {
-      ValidationResult result = new ValidationResult( true, null );
-
-      if( GeneralUtilities.CanConvertValue( value, _type ) )
-      {
-        try
-        {
-          _propertyTypeConverter.ConvertFrom( value );
-        }
-        catch( Exception e )
-        {
-          // Will display a red border in propertyGrid
-          result = new ValidationResult( false, e.Message );
-        }
-      }
-      return result;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
deleted file mode 100644
index f0d191ad..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Collections.Generic;
-using System.Collections;
-using System;
-using System.Windows;
-using System.ComponentModel;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Data;
-using System.Diagnostics;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal abstract class ContainerHelperBase
-  {
-    protected readonly IPropertyContainer PropertyContainer;
-
-    public ContainerHelperBase(IPropertyContainer propertyContainer)
-    {
-      if( propertyContainer == null )
-        throw new ArgumentNullException( "propertyContainer" );
-
-      PropertyContainer = propertyContainer;
-
-      var propChange = propertyContainer as INotifyPropertyChanged;
-      if( propChange != null )
-      {
-        propChange.PropertyChanged += new PropertyChangedEventHandler( OnPropertyContainerPropertyChanged );
-      }
-    }
-
-    #region IsGenerated attached property
-
-    internal static readonly DependencyProperty IsGeneratedProperty = DependencyProperty.RegisterAttached(
-      "IsGenerated",
-      typeof( bool ),
-      typeof( ContainerHelperBase ),
-      new PropertyMetadata( false ) );
-
-    internal static bool GetIsGenerated( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( ContainerHelperBase.IsGeneratedProperty );
-    }
-
-    internal static void SetIsGenerated( DependencyObject obj, bool value )
-    {
-      obj.SetValue( ContainerHelperBase.IsGeneratedProperty, value );
-    }
-
-    #endregion IsGenerated attached property
-
-    public abstract IList Properties
-    {
-      get;
-    }
-
-    internal ItemsControl ChildrenItemsControl
-    {
-      get;
-      set;
-    }
-
-    internal bool IsCleaning
-    {
-      get;
-      private set;
-    }
-
-    public virtual void ClearHelper()
-    {
-      this.IsCleaning = true;
-
-      var propChange = PropertyContainer as INotifyPropertyChanged;
-      if( propChange != null )
-      {
-        propChange.PropertyChanged -= new PropertyChangedEventHandler( OnPropertyContainerPropertyChanged );
-      }
-
-      // Calling RemoveAll() will force the ItemsContol displaying the
-      // properties to clear all the current container (i.e., ClearContainerForItem).
-      // This will make the call at "ClearChildrenPropertyItem" for every prepared
-      // container. Fortunately, the ItemsContainer will not re-prepare the items yet
-      // (i.e., probably made on next measure pass), allowing us to set up the new
-      // parent helper.
-      if( ChildrenItemsControl != null )
-      {
-        ( ( IItemContainerGenerator )ChildrenItemsControl.ItemContainerGenerator ).RemoveAll();
-      }
-      this.IsCleaning = false;
-    }
-
-    public virtual void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, object item ) 
-    {
-      // Initialize the parent node
-      propertyItem.ParentNode = PropertyContainer;
-
-      PropertyGrid.RaisePreparePropertyItemEvent( ( UIElement )PropertyContainer, propertyItem, item );
-    }
-
-    public virtual void ClearChildrenPropertyItem( PropertyItemBase propertyItem, object item )
-    {
-
-      propertyItem.ParentNode = null;
-
-      PropertyGrid.RaiseClearPropertyItemEvent( ( UIElement )PropertyContainer, propertyItem, item );
-    }
-
-    protected FrameworkElement GenerateCustomEditingElement( Type definitionKey, PropertyItemBase propertyItem )
-    {
-      return ( PropertyContainer.EditorDefinitions != null )
-        ? this.CreateCustomEditor( PropertyContainer.EditorDefinitions.GetRecursiveBaseTypes( definitionKey ), propertyItem )
-        : null;
-    }
-
-    protected FrameworkElement GenerateCustomEditingElement( object definitionKey, PropertyItemBase propertyItem )
-    {
-      return ( PropertyContainer.EditorDefinitions != null )
-        ? this.CreateCustomEditor( PropertyContainer.EditorDefinitions[ definitionKey ], propertyItem )
-        : null;
-    }
-
-    protected FrameworkElement CreateCustomEditor( EditorDefinitionBase customEditor, PropertyItemBase propertyItem )
-    {
-      return ( customEditor != null )
-        ? customEditor.GenerateEditingElementInternal( propertyItem )
-        : null;
-    }
-
-    protected virtual void OnPropertyContainerPropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      var propertyName = e.PropertyName;
-      IPropertyContainer ps = null;
-      if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.FilterInfo ) )
-      {
-        this.OnFilterChanged();
-      }
-      else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.IsCategorized ) )
-      {
-        this.OnCategorizationChanged();
-      }
-      else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.AutoGenerateProperties ) )
-      {
-        this.OnAutoGeneratePropertiesChanged();
-      }
-      else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.HideInheritedProperties ) )
-      {
-        this.OnHideInheritedPropertiesChanged();
-      }
-      else if(propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.EditorDefinitions ))
-      {
-        this.OnEditorDefinitionsChanged();
-      }
-      else if(propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.PropertyDefinitions ))
-      {
-        this.OnPropertyDefinitionsChanged();
-      }
-    }
-
-    protected virtual void OnCategorizationChanged() { }
-
-    protected virtual void OnFilterChanged() { }
-
-    protected virtual void OnAutoGeneratePropertiesChanged() { }
-
-    protected virtual void OnHideInheritedPropertiesChanged() { }
-
-    protected virtual void OnEditorDefinitionsChanged() { }
-
-    protected virtual void OnPropertyDefinitionsChanged() { }
-
-
-    public virtual void OnEndInit() { }
-
-    public abstract PropertyItemBase ContainerFromItem( object item );
-
-    public abstract object ItemFromContainer( PropertyItemBase container );
-
-    public abstract Binding CreateChildrenDefaultBinding( PropertyItemBase propertyItem );
-
-    public virtual void NotifyEditorDefinitionsCollectionChanged() { }
-    public virtual void NotifyPropertyDefinitionsCollectionChanged() { }
-
-    public abstract void UpdateValuesFromSource();
-
-    protected internal virtual void SetPropertiesExpansion( bool isExpanded )
-    {
-      foreach( var item in this.Properties )
-      {
-        var propertyItem = item as PropertyItemBase;
-        if( (propertyItem != null) && propertyItem.IsExpandable )
-        {
-          if( propertyItem.ContainerHelper != null )
-          {
-            propertyItem.ContainerHelper.SetPropertiesExpansion( isExpanded );
-          }
-          propertyItem.IsExpanded = isExpanded;
-        }
-      }
-    }
-
-    protected internal virtual void SetPropertiesExpansion( string propertyName, bool isExpanded )
-    {
-      foreach( var item in this.Properties )
-      {
-        var propertyItem = item as PropertyItemBase;
-        if( (propertyItem != null) && propertyItem.IsExpandable )
-        {
-          if( propertyItem.DisplayName == propertyName )
-          {
-            propertyItem.IsExpanded = isExpanded;
-            break;
-          }
-
-          if( propertyItem.ContainerHelper != null )
-          {
-            propertyItem.ContainerHelper.SetPropertiesExpansion( propertyName, isExpanded );
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
deleted file mode 100644
index 669e01d1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  /// <summary>
-  /// Converts a TimeSpan value to a DateTime value.
-  /// 
-  /// This converter can be used in conjunction with a TimePicker in order 
-  /// to create a TimeSpan edit control. 
-  /// </summary>
-  public sealed class EditorTimeSpanConverter : IValueConverter
-  {
-    public bool AllowNulls { get; set; }
-
-    object IValueConverter.Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( this.AllowNulls && value == null )
-        return null;
-
-      TimeSpan timeSpan = ( value != null ) ? ( TimeSpan )value : TimeSpan.Zero;
-      return DateTime.Today + timeSpan;
-    }
-
-    object IValueConverter.ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( this.AllowNulls && value == null )
-        return null;
-
-      return ( value != null )
-        ? ( ( DateTime )value ).TimeOfDay
-        : TimeSpan.Zero;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
deleted file mode 100644
index c2e68614..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class ExpandableObjectMarginConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      int childLevel = ( int )value;
-      return new Thickness( childLevel * 15, 0, 0, 0 );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs
deleted file mode 100644
index 548c706f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class IsDefaultCategoryConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      string categoryName = value as string;
-      if( categoryName != null )
-      {
-        return ( categoryName == CategoryAttribute.Default.Category );
-      }
-
-      return false;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs
deleted file mode 100644
index 7ed0af19..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class IsStringEmptyConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is string )
-      {
-        return string.IsNullOrEmpty( ( string )value );
-      }
-
-      return false;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
deleted file mode 100644
index ad71a2db..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel;
-using System.Collections;
-using System.Collections.ObjectModel;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  internal class ListConverter : TypeConverter
-  {
-    public override bool CanConvertFrom( ITypeDescriptorContext context, Type sourceType )
-    {
-      return true;
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext context, Type destinationType )
-    {
-      return ( destinationType == typeof( string ) );
-    }
-
-    public override object ConvertFrom( ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value )
-    {
-      if( value == null )
-        return null;
-
-      string names = value as string;
-
-      var list = new List<object>();
-      if( names == null && value != null )
-      {
-        list.Add( value );
-      }
-      else
-      {
-        if( names == null )
-          return null;
-
-        foreach( var name in names.Split( ',' ) )
-        {
-          list.Add( name.Trim() );
-        }
-      }
-
-      return new ReadOnlyCollection<object>( list );
-    }
-
-    public override object ConvertTo( ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destinationType )
-    {
-      if( destinationType != typeof( string ) )
-        throw new InvalidOperationException( "Can only convert to string." );
-
-
-      IList strs = ( IList )value;
-
-      if( strs == null )
-        return null;
-
-      StringBuilder sb = new StringBuilder();
-      bool first = true;
-      foreach( object o in strs )
-      {
-        if( o == null )
-          throw new InvalidOperationException( "Property names cannot be null." );
-
-        string s = o as string;
-        if( s == null )
-          throw new InvalidOperationException( "Does not support serialization of non-string property names." );
-
-        if( s.Contains( ',' ) )
-          throw new InvalidOperationException( "Property names cannot contain commas." );
-
-        if( s.Trim().Length != s.Length )
-          throw new InvalidOperationException( "Property names cannot start or end with whitespace characters." );
-
-        if( !first )
-        {
-          sb.Append( ", " );
-        }
-        first = false;
-
-        sb.Append( s );
-      }
-
-      return sb.ToString();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs
deleted file mode 100644
index d74dafdf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class ObjectToUIElementConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is UIElement )
-        return value;
-
-      return new Control();
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
deleted file mode 100644
index e1c31a8f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class PropertyItemEditorConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( values == null ) || ( values.Length != 2 ) )
-        return null;
-
-      var editor = values[ 0 ];
-      var isReadOnly = values[ 1 ] as bool?;
-
-      if( ( editor == null ) || !isReadOnly.HasValue )
-        return editor;
-
-      // Get Editor.IsReadOnly
-      var editorType = editor.GetType();
-      var editorIsReadOnlyPropertyInfo = editorType.GetProperty( "IsReadOnly" );
-      if( editorIsReadOnlyPropertyInfo != null )
-      {
-        // Set Editor.IsReadOnly to PropertyGrid.IsReadOnly.
-        editorIsReadOnlyPropertyInfo.SetValue( editor, isReadOnly, null );
-      }
-      // No Editor.IsReadOnly property, set the Editor.IsEnabled property.
-      else
-      {
-        var editorIsEnabledPropertyInfo = editorType.GetProperty( "IsEnabled" );
-        if( editorIsEnabledPropertyInfo != null )
-        {
-          // Set Editor.IsEnabled to !PropertyGrid.IsReadOnly.
-          editorIsEnabledPropertyInfo.SetValue( editor, !isReadOnly, null );
-        }
-      }
-
-      return editor;
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
deleted file mode 100644
index f13b1cbd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
-using System.ComponentModel;
-using System.Windows;
-using System.Reflection;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class SelectedObjectConverter : IValueConverter
-  {
-    private const string ValidParameterMessage = @"parameter must be one of the following strings: 'Type', 'TypeName', 'SelectedObjectName'";
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( parameter == null )
-        throw new ArgumentNullException( "parameter" );
-
-      if( !( parameter is string ) )
-        throw new ArgumentException( SelectedObjectConverter.ValidParameterMessage );
-
-      if( this.CompareParam(parameter, "Type") )
-      {
-        return this.ConvertToType( value, culture );
-      }
-      else if( this.CompareParam( parameter, "TypeName" ) )
-      {
-        return this.ConvertToTypeName( value, culture );
-      }
-      else if( this.CompareParam( parameter, "SelectedObjectName" ) )
-      {
-        return this.ConvertToSelectedObjectName( value, culture );
-      }
-      else
-      {
-        throw new ArgumentException( SelectedObjectConverter.ValidParameterMessage );
-      }
-    }
-
-    private bool CompareParam(object parameter, string parameterValue )
-    {
-      return string.Compare( ( string )parameter, parameterValue, true ) == 0;
-    }
-
-    private object ConvertToType( object value, CultureInfo culture )
-    {
-      return ( value != null )
-        ? value.GetType()
-        : null;
-    }
-
-    private object ConvertToTypeName( object value, CultureInfo culture )
-    {
-      if( value == null )
-        return string.Empty;
-
-      Type newType = value.GetType();
-
-      //ICustomTypeProvider is only available in .net 4.5 and over. Use reflection so the .net 4.0 and .net 3.5 still works.
-      if( newType.GetInterface( "ICustomTypeProvider", true ) != null )
-      {
-        var methodInfo = newType.GetMethod( "GetCustomType" );
-        newType = methodInfo.Invoke( value, null ) as Type;
-      }
-
-      DisplayNameAttribute displayNameAttribute = newType.GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
-
-      return (displayNameAttribute == null)
-        ? newType.Name 
-        : displayNameAttribute.DisplayName;
-    }
-
-    private object ConvertToSelectedObjectName( object value, CultureInfo culture )
-    {
-      if( value == null )
-        return String.Empty;
-
-      Type newType = value.GetType();
-      PropertyInfo[] properties = newType.GetProperties();
-      foreach( PropertyInfo property in properties )
-      {
-        if( property.Name == "Name" )
-          return property.GetValue( value, null );
-      }
-
-      return String.Empty;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
deleted file mode 100644
index 25da77bb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  /// <summary>
-  /// Used when properties are provided using a list source of items (eg. Properties or PropertiesSource). 
-  /// 
-  /// An instance of this class can be used as an item to easily customize the 
-  /// display of the property directly by modifying the values of this class 
-  /// (e.g., DisplayName, value, Category, etc.).
-  /// </summary>
-  public class CustomPropertyItem : PropertyItemBase
-  {
-    #region Constructors
-
-    internal CustomPropertyItem() { }
-
-    internal CustomPropertyItem( bool isPropertyGridCategorized, bool isSortedAlphabetically )
-    {
-      _isPropertyGridCategorized = isPropertyGridCategorized;
-      _isSortedAlphabetically = isSortedAlphabetically;
-    }
-
-
-    #endregion
-
-    #region Properties
-
-    #region Category
-
-    public static readonly DependencyProperty CategoryProperty =
-        DependencyProperty.Register( "Category", typeof( string ), typeof( CustomPropertyItem ), new UIPropertyMetadata( null ) );
-
-    public string Category
-    {
-      get { return ( string )GetValue( CategoryProperty ); }
-      set { SetValue( CategoryProperty, value ); }
-    }
-
-    #endregion //Category
-
-    #region CategoryOrder
-
-    public int CategoryOrder
-    {
-      get
-      {
-        return _categoryOrder;
-      }
-      set
-      {
-        if( _categoryOrder != value )
-        {
-          _categoryOrder = value;
-          // Notify the parent helper since this property may affect ordering.
-          this.RaisePropertyChanged( () => this.CategoryOrder );
-        }
-      }
-    }
-
-    private int _categoryOrder;
-
-    #endregion //CategoryOrder
-
-
-
-
-
-    #region PropertyOrder
-
-    public static readonly DependencyProperty PropertyOrderProperty =
-        DependencyProperty.Register( "PropertyOrder", typeof( int ), typeof( CustomPropertyItem ), new UIPropertyMetadata( 0 ) );
-
-    public int PropertyOrder
-    {
-      get
-      {
-        return ( int )GetValue( PropertyOrderProperty );
-      }
-      set
-      {
-        SetValue( PropertyOrderProperty, value );
-      }
-    }
-
-    #endregion //PropertyOrder
-
-    #region Value
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( CustomPropertyItem ), new UIPropertyMetadata( null, OnValueChanged, OnCoerceValueChanged ) );
-    public object Value
-    {
-      get
-      {
-        return ( object )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private static object OnCoerceValueChanged( DependencyObject o, object baseValue )
-    {
-      CustomPropertyItem prop = o as CustomPropertyItem;
-      if( prop != null )
-        return prop.OnCoerceValueChanged( baseValue );
-
-      return baseValue;
-    }
-
-    protected virtual object OnCoerceValueChanged( object baseValue )
-    {
-      return baseValue;
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      CustomPropertyItem propertyItem = o as CustomPropertyItem;
-      if( propertyItem != null )
-      {
-        propertyItem.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
-      }
-    }
-
-    protected virtual void OnValueChanged( object oldValue, object newValue )
-    {
-      if( IsInitialized )
-      {
-        RaiseEvent( new PropertyValueChangedEventArgs( PropertyGrid.PropertyValueChangedEvent, this, oldValue, newValue ) );
-      }
-    }
-
-    #endregion //Value
-
-    #endregion
-
-    #region Overrides
-
-    protected override Type GetPropertyItemType()
-    {
-      return this.Value.GetType();
-    }
-
-    protected override void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
-    {
-      if( oldValue != null )
-      {
-        oldValue.DataContext = null;
-      }
-
-      //case 166547 : Do not overwrite a custom Editor's DataContext set by the user.
-      if( ( newValue != null ) && ( newValue.DataContext == null ) )
-      {
-        newValue.DataContext = this;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs
deleted file mode 100644
index 009dd649..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public abstract class DefinitionBase : DependencyObject
-  {
-    private bool _isLocked;
-
-    internal bool IsLocked
-    {
-      get { return _isLocked; }
-    }
-
-    internal void ThrowIfLocked<TMember>( Expression<Func<TMember>> propertyExpression )
-    {
-      //In XAML, when using any properties of PropertyDefinition, the error of ThrowIfLocked is always thrown => prevent it !
-      if( DesignerProperties.GetIsInDesignMode( this ) )
-        return;
-
-      if( this.IsLocked )
-      {
-        string propertyName = ReflectionHelper.GetPropertyOrFieldName( propertyExpression );
-        string message = string.Format(
-            @"Cannot modify {0} once the definition has beed added to a collection.",
-            propertyName );
-        throw new InvalidOperationException( message );
-      }
-    }
-
-    internal virtual void Lock()
-    {
-      if( !_isLocked )
-      {
-        _isLocked = true;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
deleted file mode 100644
index b1490e1e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public abstract class EditorDefinitionBase : PropertyDefinitionBase
-  {
-
-    internal EditorDefinitionBase() { }
-
-    internal FrameworkElement GenerateEditingElementInternal( PropertyItemBase propertyItem ) 
-    {
-      return this.GenerateEditingElement( propertyItem );
-    }
-
-    protected virtual FrameworkElement GenerateEditingElement( PropertyItemBase propertyItem ) { return null; }
-
-    internal void UpdateProperty( FrameworkElement element, DependencyProperty elementProp, DependencyProperty definitionProperty )
-    {
-      object currentValue = this.GetValue( definitionProperty );
-      object localValue = this.ReadLocalValue( definitionProperty );
-      object elementValue = element.GetValue( elementProp );
-      bool areEquals = false;
-
-      // Avoid setting values if it does not affect anything 
-      // because setting a local value may prevent a style setter from being active.
-      if( localValue != DependencyProperty.UnsetValue )
-      {
-        if( ( elementValue != null ) && ( currentValue != null ) )
-        {
-          areEquals = ( elementValue.GetType().IsValueType && currentValue.GetType().IsValueType )
-                      ? elementValue.Equals( currentValue )  // Value Types
-                      : currentValue == element.GetValue( elementProp ); // Reference Types
-        }
-
-        if( !areEquals )
-        {
-          element.SetValue( elementProp, currentValue );
-        }
-        else
-        {
-          element.ClearValue( elementProp );
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
deleted file mode 100644
index 3449f5bf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class EditorTemplateDefinition : EditorDefinitionBase
-  {
-
-
-    #region EditingTemplate
-    public static readonly DependencyProperty EditingTemplateProperty =
-        DependencyProperty.Register( "EditingTemplate", typeof( DataTemplate ), typeof( EditorTemplateDefinition ), new UIPropertyMetadata( null ) );
-
-    public DataTemplate EditingTemplate
-    {
-      get { return ( DataTemplate )GetValue( EditingTemplateProperty ); }
-      set { SetValue( EditingTemplateProperty, value ); }
-    }
-    #endregion //EditingTemplate
-
-    protected override sealed FrameworkElement GenerateEditingElement( PropertyItemBase propertyItem )
-    {
-      return ( this.EditingTemplate != null )
-        ? this.EditingTemplate.LoadContent() as FrameworkElement
-        : null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
deleted file mode 100644
index 81d370be..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public abstract class PropertyDefinitionBase : DefinitionBase
-  {
-    #region Constructors
-
-    internal PropertyDefinitionBase()
-    {
-      _targetProperties = new List<object>();
-      this.PropertyDefinitions = new PropertyDefinitionCollection();
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region TargetProperties
-
-    [TypeConverter(typeof(ListConverter))]
-    public IList TargetProperties 
-    {
-      get { return _targetProperties; }
-      set 
-      {
-        this.ThrowIfLocked( () => this.TargetProperties );
-        _targetProperties = value; 
-      }
-    }
-
-    private IList _targetProperties;
-
-    #endregion
-
-    #region PropertyDefinitions
-
-    public PropertyDefinitionCollection PropertyDefinitions
-    {
-      get
-      {
-        return _propertyDefinitions;
-      }
-      set
-      {
-        this.ThrowIfLocked( () => this.PropertyDefinitions );
-        _propertyDefinitions = value;
-      }
-    }
-
-    private PropertyDefinitionCollection _propertyDefinitions;
-
-    #endregion //PropertyDefinitions
-
-    #endregion
-
-    #region Overrides
-
-    internal override void Lock()
-    {
-      if( this.IsLocked )
-        return;
-
-      base.Lock();
-
-      // Just create a new copy of the properties target to ensure 
-      // that the list doesn't ever get modified.
-
-      List<object> newList = new List<object>();
-      if( _targetProperties != null )
-      {
-        foreach( object p in _targetProperties )
-        {
-          object prop = p;
-          // Convert all TargetPropertyType to Types
-          var targetType = prop as TargetPropertyType;
-          if( targetType != null )
-          {
-            prop = targetType.Type;
-          }
-          newList.Add( prop );
-        }
-      }
-
-      //In Designer Mode, the Designer is broken if using a ReadOnlyCollection
-      _targetProperties = DesignerProperties.GetIsInDesignMode( this )
-                          ? new Collection<object>( newList )
-                          : new ReadOnlyCollection<object>( newList ) as IList;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
deleted file mode 100644
index 0550f466..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Markup.Primitives;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Reflection;
-using System.Globalization;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal class DescriptorPropertyDefinition : DescriptorPropertyDefinitionBase
-  {
-    #region Members
-
-    private object _selectedObject;
-    private PropertyDescriptor _propertyDescriptor;
-    private DependencyPropertyDescriptor _dpDescriptor;
-    private MarkupObject _markupObject;
-
-    #endregion
-
-    #region Constructor
-
-    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, object selectedObject, IPropertyContainer propertyContainer )
-       : base( propertyContainer.IsCategorized
-             )
-    {
-      this.Init( propertyDescriptor, selectedObject );
-    }
-
-    #endregion
-
-    #region Custom Properties
-
-    internal override PropertyDescriptor PropertyDescriptor
-    {
-      get
-      {
-        return _propertyDescriptor;
-      }
-    }
-
-    private object SelectedObject
-    {
-      get
-      {
-        return _selectedObject;
-      }
-    }
-
-    #endregion
-
-    #region Override Methods
-
-    internal override ObjectContainerHelperBase CreateContainerHelper( IPropertyContainer parent )
-    {
-      return new ObjectContainerHelper( parent, this.Value );
-    }
-
-    internal override void OnValueChanged( object oldValue, object newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-      this.RaiseContainerHelperInvalidated();
-    }
-
-    protected override BindingBase CreateValueBinding()
-    {
-      var selectedObject = this.SelectedObject;
-      var propertyName = this.PropertyDescriptor.Name;
-
-      //Bind the value property with the source object.
-      var binding = new Binding( propertyName )
-      {
-        Source = this.GetValueInstance( selectedObject ),
-        Mode = PropertyDescriptor.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay,
-        ValidatesOnDataErrors = true,
-        ValidatesOnExceptions = true,
-        ConverterCulture = CultureInfo.CurrentCulture 
-      };
-
-      return binding;
-    }
-
-    protected override bool ComputeIsReadOnly()
-    {
-      return PropertyDescriptor.IsReadOnly;
-    }
-
-    internal override ITypeEditor CreateDefaultEditor( PropertyItem propertyItem )
-    {
-      return PropertyGridUtilities.CreateDefaultEditor( PropertyDescriptor.PropertyType, PropertyDescriptor.Converter, propertyItem );
-    }
-
-    protected override bool ComputeCanResetValue()
-    {
-      if( !PropertyDescriptor.IsReadOnly )
-      {
-        var defaultValue = this.ComputeDefaultValueAttribute();
-        if( defaultValue != null)
-          return !defaultValue.Equals( this.Value ); // can Reset if different from defaultValue.
-
-        return PropertyDescriptor.CanResetValue( SelectedObject );
-      }
-
-      return false;
-    }
-
-    protected override object ComputeAdvancedOptionsTooltip()
-    {
-      object tooltip;
-      UpdateAdvanceOptionsForItem( _markupObject, SelectedObject as DependencyObject, _dpDescriptor, out tooltip );
-
-      return tooltip;
-    }
-
-    protected override string ComputeCategory()
-    {
-#if VS2008
-        return PropertyDescriptor.Category;
-#else
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( PropertyDescriptor );
-      return ( (displayAttribute != null) && (displayAttribute.GetGroupName() != null) ) ? displayAttribute.GetGroupName() : PropertyDescriptor.Category;
-#endif
-    }
-
-    protected override string ComputeCategoryValue()
-    {
-      return PropertyDescriptor.Category;
-    }
-
-    protected override bool ComputeExpandableAttribute()
-    {
-      return ( bool )this.ComputeExpandableAttributeForItem( PropertyDescriptor );
-    }
-
-    protected override object ComputeDefaultValueAttribute()
-    {
-      return this.ComputeDefaultValueAttributeForItem( PropertyDescriptor );
-    }
-
-    protected override bool ComputeIsExpandable()
-    {
-      return ( this.Value != null )
-        ;
-    }
-
-    protected override IList<Type> ComputeNewItemTypes()
-    {
-      return ( IList<Type> )ComputeNewItemTypesForItem( PropertyDescriptor );
-    }
-    protected override string ComputeDescription()
-    {
-      return ( string )ComputeDescriptionForItem( PropertyDescriptor );
-    }
-
-    protected override int ComputeDisplayOrder( bool isPropertyGridCategorized )
-    {
-      this.IsPropertyGridCategorized = isPropertyGridCategorized;
-      return ( int )ComputeDisplayOrderForItem( PropertyDescriptor );
-    }
-
-    protected override void ResetValue()
-    {
-      this.PropertyDescriptor.ResetValue( this.SelectedObject );
-      base.ResetValue();
-    }
-
-    internal override ITypeEditor CreateAttributeEditor()
-    {
-      var editorAttribute = GetAttribute<EditorAttribute>();
-      if( editorAttribute != null )
-      {
-        Type type = null;
-#if VS2008
-        type = Type.GetType( editorAttribute.EditorTypeName );
-#else
-        try
-        {
-          type = Type.GetType( editorAttribute.EditorTypeName, ( name ) =>
-          {
-            return AppDomain.CurrentDomain.GetAssemblies().Where( l => l.FullName == name.FullName ).FirstOrDefault();
-          }
-          , null, true );
-        }
-        catch( Exception )
-        {
-          type = Type.GetType( editorAttribute.EditorTypeName );
-        }       
-#endif
-
-        // If the editor does not have any public parameterless constructor, forget it.
-        if( typeof( ITypeEditor ).IsAssignableFrom( type )
-          && ( type.GetConstructor( new Type[ 0 ] ) != null ) )
-        {
-          var instance = Activator.CreateInstance( type ) as ITypeEditor;
-          Debug.Assert( instance != null, "Type was expected to be ITypeEditor with public constructor." );
-          if( instance != null )
-            return instance;
-        }
-      }
-
-      var itemsSourceAttribute = GetAttribute<ItemsSourceAttribute>();
-      if( itemsSourceAttribute != null )
-        return new ItemsSourceAttributeEditor( itemsSourceAttribute );
-
-      return null;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private T GetAttribute<T>() where T : Attribute
-    {
-      return PropertyGridUtilities.GetAttribute<T>( PropertyDescriptor );
-    }
-
-    private void Init( PropertyDescriptor propertyDescriptor, object selectedObject )
-    {
-      if( propertyDescriptor == null )
-        throw new ArgumentNullException( "propertyDescriptor" );
-
-      if( selectedObject == null )
-        throw new ArgumentNullException( "selectedObject" );
-
-      _propertyDescriptor = propertyDescriptor;
-      _selectedObject = selectedObject;
-      _dpDescriptor = DependencyPropertyDescriptor.FromProperty( propertyDescriptor );
-      _markupObject = MarkupWriter.GetMarkupObjectFor( SelectedObject );
-    }
-
-    #endregion //Private Methods
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
deleted file mode 100644
index de0d2030..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
+++ /dev/null
@@ -1,703 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Diagnostics;
-using System.ComponentModel;
-using System.Windows.Markup.Primitives;
-using System.Windows.Data;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal abstract class DescriptorPropertyDefinitionBase : DependencyObject
-  {
-    #region Members
-
-    private string _category;
-    private string _categoryValue;
-    private string _description;
-    private string _displayName;
-    private object _defaultValue;
-    private int _displayOrder;
-    private bool _expandableAttribute;
-    private bool _isReadOnly;
-    private IList<Type> _newItemTypes;
-    private IEnumerable<CommandBinding> _commandBindings;
-
-    #endregion
-
-    internal abstract PropertyDescriptor PropertyDescriptor
-    {
-      get;
-    }
-
-    #region Initialization
-
-
-    internal DescriptorPropertyDefinitionBase( bool isPropertyGridCategorized
-                                             )
-    {
-      this.IsPropertyGridCategorized = isPropertyGridCategorized;
-    }
-
-    #endregion
-
-    #region Virtual Methods
-
-    protected virtual string ComputeCategory()
-    {
-      return null;
-    }
-
-    protected virtual string ComputeCategoryValue()
-    {
-      return null;
-    }
-
-    protected virtual string ComputeDescription()
-    {
-      return null;
-    }
-
-
-
-    protected virtual int ComputeDisplayOrder( bool isPropertyGridCategorized )
-    {
-      return int.MaxValue;
-    }
-
-    protected virtual bool ComputeExpandableAttribute()
-    {
-      return false;
-    }
-
-    protected virtual object ComputeDefaultValueAttribute()
-    {
-      return null;
-    }
-
-    protected abstract bool ComputeIsExpandable();
-
-    protected virtual IList<Type> ComputeNewItemTypes()
-    {
-      return null;
-    }
-
-    protected virtual bool ComputeIsReadOnly()
-    {
-      return false;
-    }
-
-    protected virtual bool ComputeCanResetValue()
-    {
-      return false;
-    }
-
-    protected virtual object ComputeAdvancedOptionsTooltip()
-    {
-      return null;
-    }
-
-    protected virtual void ResetValue()
-    {
-      var binding = BindingOperations.GetBindingExpressionBase( this, DescriptorPropertyDefinition.ValueProperty );
-      if( binding != null )
-      {
-        binding.UpdateTarget();
-      }
-    }
-
-    protected abstract BindingBase CreateValueBinding();
-
-    #endregion
-
-    #region Internal Methods
-
-    internal abstract ObjectContainerHelperBase CreateContainerHelper( IPropertyContainer parent );
-
-    internal void RaiseContainerHelperInvalidated()
-    {
-      if( this.ContainerHelperInvalidated != null )
-      {
-        this.ContainerHelperInvalidated( this, EventArgs.Empty );
-      }
-    }
-
-    internal virtual ITypeEditor CreateDefaultEditor( PropertyItem propertyItem )
-    {
-      return null;
-    }
-
-    internal virtual ITypeEditor CreateAttributeEditor()
-    {
-      return null;
-    }
-
-    internal void UpdateAdvanceOptionsForItem( MarkupObject markupObject, DependencyObject dependencyObject, DependencyPropertyDescriptor dpDescriptor,
-                                                out object tooltip )
-    {
-      tooltip = StringConstants.Default;
-
-      bool isResource = false;
-      bool isDynamicResource = false;
-
-      var markupProperty = markupObject.Properties.FirstOrDefault( p => p.Name == PropertyName );
-      if( markupProperty != null )
-      {
-        //TODO: need to find a better way to determine if a StaticResource has been applied to any property not just a style(maybe with StaticResourceExtension)
-        isResource = typeof( Style ).IsAssignableFrom( markupProperty.PropertyType );
-        isDynamicResource = typeof( DynamicResourceExtension ).IsAssignableFrom( markupProperty.PropertyType );
-      }
-
-      if( isResource || isDynamicResource )
-      {
-        tooltip = StringConstants.Resource;
-      }
-      else
-      {
-        if( ( dependencyObject != null ) && ( dpDescriptor != null ) )
-        {
-          if( BindingOperations.GetBindingExpressionBase( dependencyObject, dpDescriptor.DependencyProperty ) != null )
-          {
-            tooltip = StringConstants.Databinding;
-          }
-          else
-          {
-            BaseValueSource bvs =
-              DependencyPropertyHelper
-              .GetValueSource( dependencyObject, dpDescriptor.DependencyProperty )
-              .BaseValueSource;
-
-            switch( bvs )
-            {
-              case BaseValueSource.Inherited:
-              case BaseValueSource.DefaultStyle:
-              case BaseValueSource.ImplicitStyleReference:
-                tooltip = StringConstants.Inheritance;
-                break;
-              case BaseValueSource.DefaultStyleTrigger:
-                break;
-              case BaseValueSource.Style:
-                tooltip = StringConstants.StyleSetter;
-                break;
-
-              case BaseValueSource.Local:
-                tooltip = StringConstants.Local;
-                break;
-            }
-          }
-        }
-        else
-        {
-          // When the Value is diferent from the DefaultValue, use the local icon.
-          if( markupProperty != null && !markupProperty.Value.Equals( this.DefaultValue ) )
-          {
-            if( this.DefaultValue != null )
-            {
-              if( !markupProperty.Value.Equals( this.DefaultValue ) )
-              {
-                tooltip = StringConstants.Local;
-              }
-            }
-            else
-            {
-              if( markupProperty.PropertyType.IsValueType )
-              {
-                var defaultValue = Activator.CreateInstance( markupProperty.PropertyType );
-                // When the Value is diferent from the DefaultValue, use the local icon.
-                if( !markupProperty.Value.Equals( defaultValue ) )
-                {
-                  tooltip = StringConstants.Local;
-                }
-              }
-              else
-              {
-                // When the Value is diferent from the DefaultValue, use the local icon.
-                if( !(markupProperty.Value is System.Windows.Markup.NullExtension) )
-                {
-                  tooltip = StringConstants.Local;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    internal void UpdateAdvanceOptions()
-    {
-      // Only set the Tooltip. The Icon will be added in XAML based on the Tooltip.
-      this.AdvancedOptionsTooltip = this.ComputeAdvancedOptionsTooltip();
-    }
-
-    internal void UpdateIsExpandable()
-    {
-      this.IsExpandable = this.ComputeIsExpandable() 
-                          && ( this.ExpandableAttribute
-                             );
-    }
-
-    internal void UpdateValueFromSource()
-    {
-      var bindingExpr = BindingOperations.GetBindingExpressionBase( this, DescriptorPropertyDefinitionBase.ValueProperty );
-      if( bindingExpr != null )
-      {
-        bindingExpr.UpdateTarget();
-      }
-    }
-
-
-
-
-
-    internal object ComputeDescriptionForItem( object item )
-    {
-      PropertyDescriptor pd = item as PropertyDescriptor;
-
-      //We do not simply rely on the "Description" property of PropertyDescriptor
-      //since this value is cached by PropertyDescriptor and the localized version 
-      //(e.g., LocalizedDescriptionAttribute) value can dynamicaly change.
-#if !VS2008
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( pd );
-      if( displayAttribute != null )
-      {
-        return displayAttribute.GetDescription();
-      }
-#endif
-
-      var descriptionAtt = PropertyGridUtilities.GetAttribute<DescriptionAttribute>( pd );
-      return (descriptionAtt != null)
-              ? descriptionAtt.Description
-              : pd.Description;
-    }
-
-    internal object ComputeNewItemTypesForItem( object item )
-    {
-      PropertyDescriptor pd = item as PropertyDescriptor;
-      var attribute = PropertyGridUtilities.GetAttribute<NewItemTypesAttribute>( pd );
-
-      return (attribute != null)
-              ? attribute.Types
-              : null;
-    }
-
-
-
-
-
-    internal object ComputeDisplayOrderForItem( object item )
-    {
-      PropertyDescriptor pd = item as PropertyDescriptor;
-#if !VS2008
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( PropertyDescriptor );
-      if( displayAttribute != null )
-      {
-        var order = displayAttribute.GetOrder();
-        if( order.HasValue )
-          return displayAttribute.GetOrder();
-      }
-#endif
-
-      List<PropertyOrderAttribute> list = pd.Attributes.OfType<PropertyOrderAttribute>().ToList();
-
-      if( list.Count > 0 )
-      {
-        this.ValidatePropertyOrderAttributes( list );
-
-        if( this.IsPropertyGridCategorized )
-        {
-          var attribute = list.FirstOrDefault( x => ((x.UsageContext == UsageContextEnum.Categorized)
-                                                    || (x.UsageContext == UsageContextEnum.Both)) );
-          if( attribute != null )
-            return attribute.Order;
-        }
-        else
-        {
-          var attribute = list.FirstOrDefault( x => ((x.UsageContext == UsageContextEnum.Alphabetical)
-                                                    || (x.UsageContext == UsageContextEnum.Both)) );
-          if( attribute != null )
-            return attribute.Order;
-        }
-      }
-
-      // Max Value. Properties with no order will be displayed last.
-      return int.MaxValue;
-    }
-
-    internal object ComputeExpandableAttributeForItem( object item )
-    {
-      var pd = (PropertyDescriptor)item;
-
-      var attribute = PropertyGridUtilities.GetAttribute<ExpandableObjectAttribute>( pd );
-      return (attribute != null);
-    }
-
-    internal int ComputeDisplayOrderInternal( bool isPropertyGridCategorized )
-    {
-      return this.ComputeDisplayOrder( isPropertyGridCategorized );
-    }
-
-    internal object GetValueInstance( object sourceObject )
-    {
-      ICustomTypeDescriptor customTypeDescriptor = sourceObject as ICustomTypeDescriptor;
-      if( customTypeDescriptor != null )
-        sourceObject = customTypeDescriptor.GetPropertyOwner( PropertyDescriptor );
-
-      return sourceObject;
-    }
-
-    internal object ComputeDefaultValueAttributeForItem( object item )
-    {
-      var pd = ( PropertyDescriptor )item;
-
-      var defaultValue = PropertyGridUtilities.GetAttribute<DefaultValueAttribute>( pd );
-      return ( defaultValue != null ) ? defaultValue.Value : null;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private static void ExecuteResetValueCommand( object sender, ExecutedRoutedEventArgs e )
-    {
-      var affectedPropertyItem = e.Parameter as PropertyItem;
-      if( affectedPropertyItem == null )
-      {
-        affectedPropertyItem = sender as PropertyItem;
-      }
-
-      if( ( affectedPropertyItem != null ) && ( affectedPropertyItem.DescriptorDefinition != null ) )
-      {
-        if( affectedPropertyItem.DescriptorDefinition.ComputeCanResetValue() )
-        {
-          affectedPropertyItem.DescriptorDefinition.ResetValue();
-        }
-      }
-    }
-
-    private static void CanExecuteResetValueCommand( object sender, CanExecuteRoutedEventArgs e )
-    {
-      var affectedPropertyItem = e.Parameter as PropertyItem;
-      if( affectedPropertyItem == null )
-      {
-        affectedPropertyItem = sender as PropertyItem;
-      }
-
-      e.CanExecute = ( (affectedPropertyItem != null) && ( affectedPropertyItem.DescriptorDefinition != null) ) 
-                      ? affectedPropertyItem.DescriptorDefinition.ComputeCanResetValue()
-                      : false;
-    }
-
-    private string ComputeDisplayName()
-    {
-#if VS2008
-        var displayName = PropertyDescriptor.DisplayName;
-#else
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( PropertyDescriptor );
-      var displayName = (displayAttribute != null) ? displayAttribute.GetName() : PropertyDescriptor.DisplayName;
-#endif
-
-      var attribute = PropertyGridUtilities.GetAttribute<ParenthesizePropertyNameAttribute>( PropertyDescriptor );
-      if( (attribute != null) && attribute.NeedParenthesis )
-      {
-        displayName = "(" + displayName + ")";
-      }
-
-      return displayName;
-    }
-
-    private void ValidatePropertyOrderAttributes( List<PropertyOrderAttribute> list )
-    {
-      if( list.Count > 0 )
-      {
-        PropertyOrderAttribute both = list.FirstOrDefault( x => x.UsageContext == UsageContextEnum.Both );
-        if( (both != null) && (list.Count > 1) )
-          Debug.Assert( false, "A PropertyItem can't have more than 1 PropertyOrderAttribute when it has UsageContext : Both" );
-      }
-    }
-
-    #endregion
-
-    #region Events
-
-    public event EventHandler ContainerHelperInvalidated;
-
-    #endregion
-
-    #region AdvancedOptionsIcon (DP)
-
-    public static readonly DependencyProperty AdvancedOptionsIconProperty =
-        DependencyProperty.Register( "AdvancedOptionsIcon", typeof( ImageSource ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null ) );
-
-    public ImageSource AdvancedOptionsIcon
-    {
-      get
-      {
-        return (ImageSource)GetValue( AdvancedOptionsIconProperty );
-      }
-      set
-      {
-        SetValue( AdvancedOptionsIconProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region AdvancedOptionsTooltip (DP)
-
-    public static readonly DependencyProperty AdvancedOptionsTooltipProperty =
-        DependencyProperty.Register( "AdvancedOptionsTooltip", typeof( object ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null ) );
-
-    public object AdvancedOptionsTooltip
-    {
-      get
-      {
-        return (object)GetValue( AdvancedOptionsTooltipProperty );
-      }
-      set
-      {
-        SetValue( AdvancedOptionsTooltipProperty, value );
-      }
-    }
-
-    #endregion //AdvancedOptionsTooltip
-
-    #region IsExpandable (DP)
-
-    public static readonly DependencyProperty IsExpandableProperty =
-        DependencyProperty.Register( "IsExpandable", typeof( bool ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( false ) );
-
-    public bool IsExpandable
-    {
-      get
-      {
-        return (bool)GetValue( IsExpandableProperty );
-      }
-      set
-      {
-        SetValue( IsExpandableProperty, value );
-      }
-    }
-
-    #endregion //IsExpandable
-
-    public string Category
-    {
-      get
-      {
-        return _category;
-      }
-      internal set
-      {
-        _category = value;
-      }
-    }
-
-    public string CategoryValue
-    {
-      get
-      {
-        return _categoryValue;
-      }
-      internal set
-      {
-        _categoryValue = value;
-      }
-    }
-
-    public IEnumerable<CommandBinding> CommandBindings
-    {
-      get
-      {
-        return _commandBindings;
-      }
-    }
-
-    public string DisplayName
-    {
-      get
-      {
-        return _displayName;
-      }
-      internal set
-      {
-        _displayName = value;
-      }
-    }
-
-    public object DefaultValue
-    {
-      get
-      {
-        return _defaultValue;
-      }
-      set
-      {
-        _defaultValue = value;
-      }
-    }
-
-
-
-    public string Description
-    {
-      get
-      {
-        return _description;
-      }
-      internal set
-      {
-        _description = value;
-      }
-    }
-
-    public int DisplayOrder
-    {
-      get
-      {
-        return _displayOrder;
-      }
-      internal set
-      {
-        _displayOrder = value;
-      }
-    }
-
-    public bool IsReadOnly
-    {
-      get
-      {
-        return _isReadOnly;
-      }
-    }
-
-    public IList<Type> NewItemTypes
-    {
-      get
-      {
-        return _newItemTypes;
-      }
-    }
-
-    public string PropertyName
-    {
-      get
-      {
-        // A common property which is present in all selectedObjects will always have the same name.
-        return PropertyDescriptor.Name;
-      }
-    }
-
-    public Type PropertyType
-    {
-      get
-      {
-        return PropertyDescriptor.PropertyType;
-      }
-    }
-
-    internal bool ExpandableAttribute
-    {
-      get
-      {
-        return _expandableAttribute;
-      }
-      set
-      {
-        _expandableAttribute = value;
-        this.UpdateIsExpandable();
-      }
-    }
-
-
-    internal bool IsPropertyGridCategorized
-    {
-      get;
-      set;
-    }
-
-
-
-    #region Value Property (DP)
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null, OnValueChanged ) );
-    public object Value
-    {
-      get
-      {
-        return GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ((DescriptorPropertyDefinitionBase)o).OnValueChanged( e.OldValue, e.NewValue );
-    }
-
-    internal virtual void OnValueChanged( object oldValue, object newValue )
-    {
-      UpdateIsExpandable();
-      UpdateAdvanceOptions();
-
-      // Reset command also affected.
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    #endregion //Value Property
-
-    public virtual void InitProperties()
-    {
-      // Do "IsReadOnly" and PropertyName first since the others may need that value.
-      _isReadOnly = ComputeIsReadOnly();
-      _category = ComputeCategory();
-      _categoryValue = ComputeCategoryValue();
-      _description = ComputeDescription();
-      _displayName = ComputeDisplayName();
-      _defaultValue = ComputeDefaultValueAttribute();
-      _displayOrder = ComputeDisplayOrder( this.IsPropertyGridCategorized );
-      _expandableAttribute = ComputeExpandableAttribute();
-
-
-      _newItemTypes = ComputeNewItemTypes();
-      _commandBindings = new CommandBinding[] { new CommandBinding( PropertyItemCommands.ResetValue, ExecuteResetValueCommand, CanExecuteResetValueCommand ) };
-
-      UpdateIsExpandable();
-      UpdateAdvanceOptions();
-
-      BindingBase valueBinding = this.CreateValueBinding();
-      BindingOperations.SetBinding( this, DescriptorPropertyDefinitionBase.ValueProperty, valueBinding );
-    }
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
deleted file mode 100644
index 862a309e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  [Obsolete(@"Use EditorTemplateDefinition instead of EditorDefinition. " + EditorDefinition.UsageEx)]
-  public class EditorDefinition : EditorTemplateDefinition
-  {
-    private const string UsageEx = " (XAML Ex: <t:EditorTemplateDefinition TargetProperties=\"FirstName,LastName\" .../> OR <t:EditorTemplateDefinition TargetProperties=\"{x:Type l:MyType}\" .../> )";
-
-    public EditorDefinition()
-    {
-      const string usageErr = "{0} is obsolete. Instead use {1}.";
-      System.Diagnostics.Trace.TraceWarning( string.Format( usageErr, typeof( EditorDefinition ), typeof( EditorTemplateDefinition ) ) + UsageEx );
-    }
-
-    /// <summary>
-    /// Gets or sets the template of the editor.
-    /// This Property is part of the obsolete EditorDefinition class.
-    /// Use EditorTemplateDefinition class and the Edit<b>ing</b>Template property.
-    /// </summary>
-    public DataTemplate EditorTemplate
-    {
-      get;
-      set;
-    }
-
-
-    private PropertyDefinitionCollection _properties = new PropertyDefinitionCollection();
-    /// <summary>
-    /// List the PropertyDefinitions that identify the properties targeted by the EditorTemplate.
-    /// This Property is part of the obsolete EditorDefinition class.
-    /// Use "EditorTemplateDefinition" class and the "TargetProperties" property<br/>
-    /// XAML Ex.: &lt;t:EditorTemplateDefinition TargetProperties="FirstName,LastName" .../&gt;
-    /// </summary>
-    public PropertyDefinitionCollection PropertiesDefinitions
-    {
-      get
-      {
-        return _properties;
-      }
-      set
-      {
-        _properties = value;
-      }
-    }
-
-    public Type TargetType
-    {
-      get;
-      set;
-    }
-
-    internal override void Lock()
-    {
-      const string usageError = @"Use a EditorTemplateDefinition instead of EditorDefinition in order to use the '{0}' property.";
-      if( this.EditingTemplate != null )
-        throw new InvalidOperationException( string.Format( usageError, "EditingTemplate" ) );
-
-      if( this.TargetProperties != null && this.TargetProperties.Count > 0)
-        throw new InvalidOperationException( string.Format( usageError, "TargetProperties" ) );
-
-      List<object> properties = new List<object>();
-      if( this.PropertiesDefinitions != null )
-      {
-        foreach( PropertyDefinition def in this.PropertiesDefinitions )
-        {
-          if( def.TargetProperties != null )
-          {
-            properties.AddRange( def.TargetProperties.Cast<object>() );
-          }
-        }
-      }
-
-      this.TargetProperties = properties;
-      this.EditingTemplate = this.EditorTemplate;
-
-      base.Lock();
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
deleted file mode 100644
index 118102c8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class CheckBoxEditor : TypeEditor<CheckBox>
-  {
-    protected override CheckBox CreateEditor()
-    {
-      return new PropertyGridEditorCheckBox();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.Margin = new Thickness( 5, 0, 0, 0 );
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = CheckBox.IsCheckedProperty;
-    }
-  }
-
-  public class PropertyGridEditorCheckBox : CheckBox
-  {
-    static PropertyGridEditorCheckBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorCheckBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorCheckBox ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
deleted file mode 100644
index c95e3814..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class CollectionEditor : TypeEditor<CollectionControlButton>
-  {
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = CollectionControlButton.ItemsSourceProperty;
-    }
-
-    protected override CollectionControlButton CreateEditor()
-    {
-      return new PropertyGridEditorCollectionControl();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-
-      var propertyGrid = propertyItem.ParentElement as PropertyGrid;
-      if( propertyGrid != null )
-      {
-        // Use the PropertyGrid.EditorDefinitions for the CollectionControl's propertyGrid.
-        this.Editor.EditorDefinitions = propertyGrid.EditorDefinitions;
-      }
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      var type = propertyItem.PropertyType;
-
-      Editor.ItemsSourceType = type;
-
-      if( type.BaseType == typeof( System.Array ) )
-      {
-        Editor.NewItemTypes = new List<Type>() { type.GetElementType() };
-      }
-      else 
-      {
-        if( (propertyItem.DescriptorDefinition != null)
-            && (propertyItem.DescriptorDefinition.NewItemTypes != null)
-            && (propertyItem.DescriptorDefinition.NewItemTypes.Count > 0) )
-        {
-          Editor.NewItemTypes = propertyItem.DescriptorDefinition.NewItemTypes;
-        }
-        else
-        {
-          //Check if we have a Dictionary
-          var dictionaryTypes = ListUtilities.GetDictionaryItemsType( type );
-          if( (dictionaryTypes != null) && (dictionaryTypes.Length == 2) )
-          {
-            // A Dictionary contains KeyValuePair that can't be edited.
-            // We need to create EditableKeyValuePairs.
-            // Create a EditableKeyValuePair< TKey, TValue> type from dictionary generic arguments type
-            var editableKeyValuePairType = ListUtilities.CreateEditableKeyValuePairType( dictionaryTypes[ 0 ], dictionaryTypes[ 1 ] );
-            Editor.NewItemTypes = new List<Type>() { editableKeyValuePairType };
-          }
-          else
-          {
-            //Check if we have a list
-            var listType = ListUtilities.GetListItemType( type );
-            if( listType != null  )
-            {
-              Editor.NewItemTypes = new List<Type>() { listType };
-            }
-            else
-            {
-              //Check if we have a Collection of T
-              var colType = ListUtilities.GetCollectionItemType( type );
-              if( colType != null )
-              {
-                Editor.NewItemTypes = new List<Type>() { colType };
-              }
-            }
-          }
-        }
-      }
-
-      base.ResolveValueBinding( propertyItem );
-    }
-
-  }
-
-  public class PropertyGridEditorCollectionControl : CollectionControlButton
-  {
-    static PropertyGridEditorCollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorCollectionControl ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorCollectionControl ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
deleted file mode 100644
index 4bc580c8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class ColorEditor : TypeEditor<ColorPicker>
-  {
-    protected override ColorPicker CreateEditor()
-    {
-      return new PropertyGridEditorColorPicker();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
-      Editor.DisplayColorAndName = true;
-    }
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = ColorPicker.SelectedColorProperty;
-    }
-  }
-
-  public class PropertyGridEditorColorPicker : ColorPicker
-  {
-    static PropertyGridEditorColorPicker()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorColorPicker ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorColorPicker ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
deleted file mode 100644
index 668bd103..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Collections.Generic;
-using System.Collections;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public abstract class ComboBoxEditor : TypeEditor<System.Windows.Controls.ComboBox>
-  {
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = System.Windows.Controls.ComboBox.SelectedItemProperty;
-    }
-
-    protected override System.Windows.Controls.ComboBox CreateEditor()
-    {
-      return new PropertyGridEditorComboBox();
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      SetItemsSource( propertyItem );
-      base.ResolveValueBinding( propertyItem );
-    }
-
-    protected abstract IEnumerable CreateItemsSource( PropertyItem propertyItem );
-
-    private void SetItemsSource( PropertyItem propertyItem )
-    {
-      Editor.ItemsSource = CreateItemsSource( propertyItem );
-    }
-  }
-
-  public class PropertyGridEditorComboBox : System.Windows.Controls.ComboBox
-  {
-    static PropertyGridEditorComboBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorComboBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorComboBox ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
deleted file mode 100644
index a607d481..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Collections;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class EnumComboBoxEditor : ComboBoxEditor
-  {
-    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
-    {
-      return GetValues( propertyItem.PropertyType );
-    }
-
-    private static object[] GetValues( Type enumType )
-    {
-      List<object> values = new List<object>();
-
-      if( enumType != null )
-      {
-        var fields = enumType.GetFields().Where( x => x.IsLiteral );
-        foreach( FieldInfo field in fields )
-        {
-          // Get array of BrowsableAttribute attributes
-          object[] attrs = field.GetCustomAttributes( typeof( BrowsableAttribute ), false );
-          if( attrs.Length == 1 )
-          {
-            // If attribute exists and its value is false continue to the next field...
-            BrowsableAttribute brAttr = ( BrowsableAttribute )attrs[ 0 ];
-            if( brAttr.Browsable == false )
-              continue;
-          }
-
-          values.Add( field.GetValue( enumType ) );
-        }
-      }
-
-      return values.ToArray();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
deleted file mode 100644
index be62f2c6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Media;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class FontComboBoxEditor : ComboBoxEditor
-  {
-    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
-    {
-      if( propertyItem.PropertyType == typeof( FontFamily ) )
-        return FontUtilities.Families.OrderBy( x => x.Source);
-      else if( propertyItem.PropertyType == typeof( FontWeight ) )
-        return FontUtilities.Weights;
-      else if( propertyItem.PropertyType == typeof( FontStyle ) )
-        return FontUtilities.Styles;
-      else if( propertyItem.PropertyType == typeof( FontStretch ) )
-        return FontUtilities.Stretches;
-
-      return null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
deleted file mode 100644
index bfeae6ab..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public interface ITypeEditor
-  {
-    FrameworkElement ResolveEditor( PropertyItem propertyItem );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
deleted file mode 100644
index 1b04f93e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class ItemsSourceAttributeEditor : TypeEditor<System.Windows.Controls.ComboBox>
-  {
-    private readonly ItemsSourceAttribute _attribute;
-
-    public ItemsSourceAttributeEditor( ItemsSourceAttribute attribute )
-    {
-      _attribute = attribute;
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = System.Windows.Controls.ComboBox.SelectedValueProperty;
-    }
-
-    protected override System.Windows.Controls.ComboBox CreateEditor()
-    {
-      return new PropertyGridEditorComboBox();
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      SetItemsSource();
-      base.ResolveValueBinding( propertyItem );
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.DisplayMemberPath = "DisplayName";
-      Editor.SelectedValuePath = "Value";
-      if( propertyItem != null )
-      {
-        Editor.IsEnabled = !propertyItem.IsReadOnly;
-      }
-    }
-
-    private void SetItemsSource()
-    {
-      Editor.ItemsSource = CreateItemsSource();
-    }
-
-    private System.Collections.IEnumerable CreateItemsSource()
-    {
-      var instance = Activator.CreateInstance( _attribute.Type );
-      return ( instance as IItemsSource ).GetValues();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
deleted file mode 100644
index 374858f2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class MaskedTextBoxEditor : TypeEditor<MaskedTextBox>
-  {
-    public string Mask
-    {
-      get;
-      set;
-    }
-
-    public Type ValueDataType
-    {
-      get;
-      set;
-    }
-
-    protected override MaskedTextBox CreateEditor()
-    {
-      return new PropertyGridEditorMaskedTextBox();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
-      this.Editor.ValueDataType = this.ValueDataType;
-      this.Editor.Mask = this.Mask;
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      this.ValueProperty = MaskedTextBox.ValueProperty;
-    }
-  }
-
-  public class PropertyGridEditorMaskedTextBox : MaskedTextBox
-  {
-    static PropertyGridEditorMaskedTextBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorMaskedTextBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorMaskedTextBox ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
deleted file mode 100644
index bd1097df..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class PrimitiveTypeCollectionEditor : TypeEditor<PrimitiveTypeCollectionControl>
-  {
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
-      Editor.Content = "(Collection)";
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = PrimitiveTypeCollectionControl.ItemsSourceProperty;
-    }
-
-    protected override PrimitiveTypeCollectionControl CreateEditor()
-    {
-      return new PropertyGridEditorPrimitiveTypeCollectionControl();
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      var type = propertyItem.PropertyType;
-      Editor.ItemsSourceType = type;
-
-      if( type.BaseType == typeof( System.Array ) )
-      {
-        Editor.ItemType = type.GetElementType();
-      }
-      else
-      {
-        var typeArguments = type.GetGenericArguments();
-        if( typeArguments.Length > 0 )
-        {
-          Editor.ItemType = typeArguments[ 0 ];
-        }
-      }
-
-      base.ResolveValueBinding( propertyItem );
-    }
-  }
-
-  public class PropertyGridEditorPrimitiveTypeCollectionControl : PrimitiveTypeCollectionControl
-  {
-    static PropertyGridEditorPrimitiveTypeCollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorPrimitiveTypeCollectionControl ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorPrimitiveTypeCollectionControl ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs
deleted file mode 100644
index b227bf42..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class SourceComboBoxEditor : ComboBoxEditor
-  {
-    ICollection _collection;
-    TypeConverter _typeConverter;
-
-    public SourceComboBoxEditor( ICollection collection, TypeConverter typeConverter )
-    {
-      _collection = collection;
-      _typeConverter = typeConverter;
-    }
-
-    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
-    {
-      return _collection;
-    }
-
-    protected override IValueConverter CreateValueConverter()
-    {
-      //When using a stringConverter, we need to convert the value
-      if( (_typeConverter != null) && (_typeConverter is StringConverter) )
-        return new SourceComboBoxEditorConverter( _typeConverter );
-      return null;
-    }
-  }
-
-  internal class SourceComboBoxEditorConverter : IValueConverter
-  {
-    private TypeConverter _typeConverter;
-
-    internal SourceComboBoxEditorConverter( TypeConverter typeConverter )
-    {
-      _typeConverter = typeConverter;
-    }
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( _typeConverter != null )
-      {
-        if( _typeConverter.CanConvertTo( typeof(string) ) )
-          return _typeConverter.ConvertTo( value, typeof(string) );
-      }
-      return value;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( _typeConverter != null )
-      {
-        if( _typeConverter.CanConvertFrom( value.GetType() ) )
-          return _typeConverter.ConvertFrom( value );
-      }
-      return value;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
deleted file mode 100644
index 78fad1d7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Controls;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class TextBlockEditor : TypeEditor<TextBlock>
-  {
-    protected override TextBlock CreateEditor()
-    {
-      return new PropertyGridEditorTextBlock();
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = TextBlock.TextProperty;
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.Margin = new System.Windows.Thickness( 5, 0, 0, 0 );
-      Editor.TextTrimming = TextTrimming.CharacterEllipsis;
-    }
-  }
-
-  public class PropertyGridEditorTextBlock : TextBlock
-  {
-    static PropertyGridEditorTextBlock()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorTextBlock ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorTextBlock ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
deleted file mode 100644
index 80db8588..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Controls;
-using System.Windows;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class TextBoxEditor : TypeEditor<WatermarkTextBox>
-  {
-    protected override WatermarkTextBox CreateEditor()
-    {
-      return new PropertyGridEditorTextBox();
-    }
-
-#if !VS2008
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( propertyItem.PropertyDescriptor );
-      if( displayAttribute != null )
-      {
-        this.Editor.Watermark = displayAttribute.GetPrompt();
-      }
-    }
-#endif
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = TextBox.TextProperty;
-    }
-  }
-
-  public class PropertyGridEditorTextBox : WatermarkTextBox
-  {
-    static PropertyGridEditorTextBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorTextBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorTextBox ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
deleted file mode 100644
index 6f897009..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Data;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public abstract class TypeEditor<T> : ITypeEditor where T : FrameworkElement, new()
-  {
-    #region Properties
-
-    protected T Editor
-    {
-      get;
-      set;
-    }
-    protected DependencyProperty ValueProperty
-    {
-      get;
-      set;
-    }
-
-    #endregion //Properties
-
-    #region ITypeEditor Members
-
-    public virtual FrameworkElement ResolveEditor( PropertyItem propertyItem )
-    {
-      Editor = this.CreateEditor();
-      SetValueDependencyProperty();
-      SetControlProperties( propertyItem );
-      ResolveValueBinding( propertyItem );
-      return Editor;
-    }
-
-    #endregion //ITypeEditor Members
-
-    #region Methods
-
-    protected virtual T CreateEditor()
-    {
-      return new T();
-    }
-
-    protected virtual IValueConverter CreateValueConverter()
-    {
-      return null;
-    }
-
-    protected virtual void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      var _binding = new Binding( "Value" );
-      _binding.Source = propertyItem;
-      _binding.UpdateSourceTrigger = (Editor is InputBase) ? UpdateSourceTrigger.PropertyChanged : UpdateSourceTrigger.Default;
-      _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-      _binding.Converter = CreateValueConverter();
-      BindingOperations.SetBinding( Editor, ValueProperty, _binding );
-    }
-
-    protected virtual void SetControlProperties( PropertyItem propertyItem )
-    {
-      //TODO: implement in derived class
-    }
-
-    protected abstract void SetValueDependencyProperty();
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
deleted file mode 100644
index ca121037..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using Xceed.Wpf.Toolkit.Primitives;
-using System;
-using System.Windows;
-using System.Windows.Data;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-using System.ComponentModel;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class UpDownEditor<TEditor, TType> : TypeEditor<TEditor> where TEditor : UpDownBase<TType>, new()
-  {
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.TextAlignment = System.Windows.TextAlignment.Left;
-    }
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = UpDownBase<TType>.ValueProperty;
-    }
-
-#if !VS2008
-    internal void SetMinMaxFromRangeAttribute( PropertyDescriptor propertyDescriptor, TypeConverter converter )
-    {
-      if( propertyDescriptor == null )
-        return;
-
-      var rangeAttribute = PropertyGridUtilities.GetAttribute<RangeAttribute>( propertyDescriptor );
-      if( rangeAttribute != null )
-      {
-        Editor.Maximum = ((TType)converter.ConvertFrom( rangeAttribute.Maximum.ToString() ));
-        Editor.Minimum = ((TType)converter.ConvertFrom( rangeAttribute.Minimum.ToString() ));
-      }
-    }
-#endif
-  }
-
-  public class NumericUpDownEditor<TEditor, TType> : UpDownEditor<TEditor, TType> where TEditor : UpDownBase<TType>, new()
-  {
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-
-      var binding = new Binding( "IsInvalid" );
-      binding.Source = this.Editor;
-      binding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
-      binding.Mode = BindingMode.TwoWay;
-      BindingOperations.SetBinding( propertyItem, PropertyItem.IsInvalidProperty, binding );
-    }
-  }
-
-  public class ByteUpDownEditor : NumericUpDownEditor<ByteUpDown, byte?>
-  {
-    protected override ByteUpDown CreateEditor()
-    {
-      return new PropertyGridEditorByteUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( byte ) ) );
-#endif
-    }
-  }
-
-  public class DecimalUpDownEditor : NumericUpDownEditor<DecimalUpDown, decimal?>
-  {
-    protected override DecimalUpDown CreateEditor()
-    {
-      return new PropertyGridEditorDecimalUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( decimal ) ) );
-#endif
-    }
-  }
-
-  public class DoubleUpDownEditor : NumericUpDownEditor<DoubleUpDown, double?> 
-  {
-    protected override DoubleUpDown CreateEditor()
-    {
-      return new PropertyGridEditorDoubleUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-      Editor.AllowInputSpecialValues = AllowedSpecialValues.Any;
-
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( double ) ) );      
-#endif
-    }
-  }
-
-  public class IntegerUpDownEditor : NumericUpDownEditor<IntegerUpDown, int?>
-  {
-    protected override IntegerUpDown CreateEditor()
-    {
-      return new PropertyGridEditorIntegerUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( int ) ) );
-#endif
-    }
-  }
-
-  public class LongUpDownEditor : NumericUpDownEditor<LongUpDown, long?>
-  {
-    protected override LongUpDown CreateEditor()
-    {
-      return new PropertyGridEditorLongUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( long ) ) );
-#endif
-    }
-  }
-
-  public class ShortUpDownEditor : NumericUpDownEditor<ShortUpDown, short?>
-  {
-    protected override ShortUpDown CreateEditor()
-    {
-      return new PropertyGridEditorShortUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( short ) ) );
-#endif
-    }
-  }
-
-  public class SingleUpDownEditor : NumericUpDownEditor<SingleUpDown, float?> 
-  {
-    protected override SingleUpDown CreateEditor()
-    {
-      return new PropertyGridEditorSingleUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-      Editor.AllowInputSpecialValues = AllowedSpecialValues.Any;
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( float ) ) );
-#endif
-    }
-  }
-
-  public class DateTimeUpDownEditor : UpDownEditor<DateTimeUpDown, DateTime?>
-  {
-    protected override DateTimeUpDown CreateEditor()
-    {
-      return new PropertyGridEditorDateTimeUpDown();
-    }
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( DateTime ) ) );
-#endif
-    }
-  }
-
-  public class TimeSpanUpDownEditor : UpDownEditor<TimeSpanUpDown, TimeSpan?>
-  {
-    protected override TimeSpanUpDown CreateEditor()
-    {
-      return new PropertyGridEditorTimeSpanUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( TimeSpan ) ) );
-#endif
-    }
-  }
-
-  internal class SByteUpDownEditor : NumericUpDownEditor<SByteUpDown, sbyte?>
-  {
-    protected override SByteUpDown CreateEditor()
-    {
-      return new PropertyGridEditorSByteUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( sbyte ) ) );
-#endif
-    }
-  }
-
-  internal class UIntegerUpDownEditor : NumericUpDownEditor<UIntegerUpDown, uint?>
-  {
-    protected override UIntegerUpDown CreateEditor()
-    {
-      return new PropertyGridEditorUIntegerUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( uint ) ) );
-#endif
-    }
-  }
-
-  internal class ULongUpDownEditor : NumericUpDownEditor<ULongUpDown, ulong?>
-  {
-    protected override ULongUpDown CreateEditor()
-    {
-      return new PropertyGridEditorULongUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( ulong ) ) );
-#endif
-    }
-  }
-
-  internal class UShortUpDownEditor : NumericUpDownEditor<UShortUpDown, ushort?>
-  {
-    protected override UShortUpDown CreateEditor()
-    {
-      return new PropertyGridEditorUShortUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( ushort ) ) );
-#endif
-    }
-  }
-
-
-
-  public class PropertyGridEditorByteUpDown : ByteUpDown
-  {
-    static PropertyGridEditorByteUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorByteUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorByteUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorDecimalUpDown : DecimalUpDown
-  {
-    static PropertyGridEditorDecimalUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorDecimalUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorDecimalUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorDoubleUpDown : DoubleUpDown
-  {
-    static PropertyGridEditorDoubleUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorDoubleUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorDoubleUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorIntegerUpDown : IntegerUpDown
-  {
-    static PropertyGridEditorIntegerUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorIntegerUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorIntegerUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorLongUpDown : LongUpDown
-  {
-    static PropertyGridEditorLongUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorLongUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorLongUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorShortUpDown : ShortUpDown
-  {
-    static PropertyGridEditorShortUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorShortUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorShortUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorSingleUpDown : SingleUpDown
-  {
-    static PropertyGridEditorSingleUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorSingleUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorSingleUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorDateTimeUpDown : DateTimeUpDown
-  {
-    static PropertyGridEditorDateTimeUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorDateTimeUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorDateTimeUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorTimeSpanUpDown : TimeSpanUpDown
-  {
-    static PropertyGridEditorTimeSpanUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorTimeSpanUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorTimeSpanUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorSByteUpDown : SByteUpDown
-  {
-    static PropertyGridEditorSByteUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorSByteUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorSByteUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorUIntegerUpDown : UIntegerUpDown
-  {
-    static PropertyGridEditorUIntegerUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorUIntegerUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorUIntegerUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorULongUpDown : ULongUpDown
-  {
-    static PropertyGridEditorULongUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorULongUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorULongUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorUShortUpDown : UShortUpDown
-  {
-    static PropertyGridEditorUShortUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorUShortUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorUShortUpDown ) ) );
-    }
-  }
-
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
deleted file mode 100644
index 86be8a12..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal struct FilterInfo
-  {
-    public string InputString;
-    public Predicate<object> Predicate;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
deleted file mode 100644
index 8ba7a517..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-
-using System.Collections.Generic;
-using System.Windows.Controls;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Data;
-using System;
-using System.Windows;
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal interface IPropertyContainer
-  {
-
-
-
-
-
-
-
-    ContainerHelperBase ContainerHelper { get; }
-
-    Style PropertyContainerStyle { get; }
-
-    EditorDefinitionCollection EditorDefinitions { get; }
-
-    PropertyDefinitionCollection PropertyDefinitions { get; }
-
-    bool IsCategorized { get; }
-
-    bool IsSortedAlphabetically { get; }
-
-    bool AutoGenerateProperties { get; }
-
-    bool HideInheritedProperties { get; }
-
-    FilterInfo FilterInfo { get; }
-
-    bool? IsPropertyVisible( PropertyDescriptor pd );
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
deleted file mode 100644
index ded4a44d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-using System.Diagnostics;
-using System.Linq;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal class ObjectContainerHelper : ObjectContainerHelperBase
-  {
-    private object _selectedObject;
-
-    public ObjectContainerHelper( IPropertyContainer propertyContainer, object selectedObject )
-      : base( propertyContainer )
-    {
-      _selectedObject = selectedObject;
-    }
-
-    private object SelectedObject
-    {
-      get
-      {
-        return _selectedObject;
-      }
-    }
-
-    protected override string GetDefaultPropertyName()
-    {
-      object selectedObject = SelectedObject;
-      return ( selectedObject != null ) ? ObjectContainerHelperBase.GetDefaultPropertyName( SelectedObject ) : ( string )null;
-    }
-
-    protected override IEnumerable<PropertyItem> GenerateSubPropertiesCore()
-    {
-      var propertyItems = new List<PropertyItem>();
-
-      if( SelectedObject != null )
-      {
-        try
-        {
-          var descriptors = new List<PropertyDescriptor>();
-          {
-            descriptors = ObjectContainerHelperBase.GetPropertyDescriptors( SelectedObject, this.PropertyContainer.HideInheritedProperties );
-          }
-
-          foreach( var descriptor in descriptors )
-          {
-            var propertyDef = this.GetPropertyDefinition( descriptor );
-            bool isBrowsable = false;
-
-            var isPropertyBrowsable = this.PropertyContainer.IsPropertyVisible( descriptor );
-            if( isPropertyBrowsable.HasValue )
-            {
-              isBrowsable = isPropertyBrowsable.Value;
-            }
-            else
-            {
-#if !VS2008
-              var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( descriptor );
-              if( displayAttribute != null )
-              {
-                var autoGenerateField = displayAttribute.GetAutoGenerateField();
-                isBrowsable = this.PropertyContainer.AutoGenerateProperties 
-                              && ((autoGenerateField.HasValue && autoGenerateField.Value) || !autoGenerateField.HasValue);
-              }
-              else
-#endif
-              {
-                isBrowsable = descriptor.IsBrowsable && this.PropertyContainer.AutoGenerateProperties;
-              }
-
-              if( propertyDef != null )
-              {
-                isBrowsable = propertyDef.IsBrowsable.GetValueOrDefault( isBrowsable );
-              }
-            }
-
-            if( isBrowsable )
-            {
-              var prop = this.CreatePropertyItem( descriptor, propertyDef );
-              if( prop != null )
-              {
-                propertyItems.Add( prop );
-              }
-            }
-          }
-        }
-        catch( Exception e )
-        {
-          //TODO: handle this some how
-          Debug.WriteLine( "Property creation failed." );
-          Debug.WriteLine( e.StackTrace );
-        }
-      }
-
-      return propertyItems;
-    }
-
-
-    private PropertyItem CreatePropertyItem( PropertyDescriptor property, PropertyDefinition propertyDef )
-    {
-      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, SelectedObject, this.PropertyContainer );                                                                                 
-      definition.InitProperties();
-
-      this.InitializeDescriptorDefinition( definition, propertyDef );
-      PropertyItem propertyItem = new PropertyItem( definition );
-      Debug.Assert( SelectedObject != null );
-      propertyItem.Instance = SelectedObject;
-      propertyItem.CategoryOrder = this.GetCategoryOrder( definition.CategoryValue );
-
-      propertyItem.WillRefreshPropertyGrid = this.GetWillRefreshPropertyGrid( property );
-      return propertyItem;
-    }
-
-    private int GetCategoryOrder( object categoryValue )
-    {
-      Debug.Assert( SelectedObject != null );
-
-      if( categoryValue == null )
-        return int.MaxValue;
-
-      int order = int.MaxValue;
-        object selectedObject = SelectedObject;
-        CategoryOrderAttribute[] orderAttributes = ( selectedObject != null )
-          ? ( CategoryOrderAttribute[] )selectedObject.GetType().GetCustomAttributes( typeof( CategoryOrderAttribute ), true )
-          : new CategoryOrderAttribute[ 0 ];
-
-        var orderAttribute = orderAttributes
-          .FirstOrDefault( ( a ) => object.Equals( a.CategoryValue, categoryValue ) );
-
-        if( orderAttribute != null )
-        {
-          order = orderAttribute.Order;
-        }
-
-      return order;
-    }
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
deleted file mode 100644
index 52a29bf2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
+++ /dev/null
@@ -1,565 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal abstract class ObjectContainerHelperBase : ContainerHelperBase
-  {
-    // This is needed to work around the ItemsControl behavior.
-    // When ItemsControl is preparing its containers, it appears 
-    // that calling Refresh() on the CollectionView bound to
-    // the ItemsSource prevents the items from being displayed.
-    // This patch is to avoid such a behavior.
-    private bool _isPreparingItemFlag = false;
-    private PropertyItemCollection _propertyItemCollection;
-
-    public ObjectContainerHelperBase( IPropertyContainer propertyContainer)
-      : base( propertyContainer )
-    {
-      _propertyItemCollection = new PropertyItemCollection( new ObservableCollection<PropertyItem>() );
-      UpdateFilter();
-      UpdateCategorization( false );
-
-    }
-
-    public override IList Properties
-    {
-      get { return _propertyItemCollection; }
-    }
-
-    private PropertyItem DefaultProperty
-    {
-      get 
-      {
-        PropertyItem defaultProperty = null;
-        var defaultName = this.GetDefaultPropertyName();
-        if( defaultName != null )
-        {
-          defaultProperty = _propertyItemCollection
-            .FirstOrDefault( ( prop ) => object.Equals( defaultName, prop.PropertyDescriptor.Name ) );
-        }
-
-        return defaultProperty;
-      }
-    }
-
-
-    protected PropertyItemCollection PropertyItems
-    {
-      get
-      {
-        return _propertyItemCollection;
-      }
-    }
-
-    public override PropertyItemBase ContainerFromItem( object item )
-    {
-      if( item == null )
-        return null;
-      // Exception case for ObjectContainerHelperBase. The "Item" may sometimes
-      // be identified as a string representing the property name or
-      // the PropertyItem itself.
-      Debug.Assert( item is PropertyItem || item is string );
-
-      var propertyItem = item as PropertyItem;
-      if( propertyItem != null )
-        return propertyItem;
-
-
-      var propertyStr = item as string;
-      if( propertyStr != null )
-        return PropertyItems.FirstOrDefault( ( prop ) => propertyStr == prop.PropertyDescriptor.Name );
-
-      return null;
-    }
-
-    public override object ItemFromContainer( PropertyItemBase container )
-    {
-      // Since this call is only used to update the PropertyGrid.SelectedProperty property,
-      // return the PropertyName.
-      var propertyItem = container as PropertyItem;
-      if( propertyItem == null )
-        return null;
-
-      return propertyItem.PropertyDescriptor.Name;
-    }
-
-    public override void  UpdateValuesFromSource()
-    {
-      foreach( PropertyItem item in PropertyItems )
-      {
-        item.DescriptorDefinition.UpdateValueFromSource();
-        item.ContainerHelper.UpdateValuesFromSource();
-      }
-    }
-
-    public void GenerateProperties()
-    {
-      if( (PropertyItems.Count == 0)
-        )
-      {
-        this.RegenerateProperties();
-      }
-    }
-
-    protected override void OnFilterChanged()
-    {
-      this.UpdateFilter();
-    }
-
-    protected override void OnCategorizationChanged()
-    {
-      UpdateCategorization( true );
-    }
-
-    protected override void OnAutoGeneratePropertiesChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-    protected override void OnHideInheritedPropertiesChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-    protected override void OnEditorDefinitionsChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-    protected override void OnPropertyDefinitionsChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-
-
-
-
-
-    protected internal override void SetPropertiesExpansion( bool isExpanded )
-    {
-      if( this.Properties.Count == 0 )
-      {
-        this.GenerateProperties();
-      }
-
-      base.SetPropertiesExpansion( isExpanded );
-    }
-
-    protected internal override void SetPropertiesExpansion( string propertyName, bool isExpanded )
-    {
-      if( this.Properties.Count == 0 )
-      {
-        this.GenerateProperties();
-      }
-
-      base.SetPropertiesExpansion( propertyName, isExpanded );
-    }
-
-    private void UpdateFilter()
-    {
-      FilterInfo filterInfo = this.PropertyContainer.FilterInfo;
-
-      this.PropertyItems.FilterPredicate = filterInfo.Predicate
-        ?? PropertyItemCollection.CreateFilter( filterInfo.InputString, this.PropertyItems, this.PropertyContainer );
-    }
-
-    private void UpdateCategorization( bool updateSubPropertiesCategorization )
-    {
-      _propertyItemCollection.UpdateCategorization( this.ComputeCategoryGroupDescription(), this.PropertyContainer.IsCategorized, this.PropertyContainer.IsSortedAlphabetically );
-      if( updateSubPropertiesCategorization && (_propertyItemCollection.Count > 0) )
-      {
-        foreach( PropertyItem propertyItem in _propertyItemCollection )
-        {
-          PropertyItemCollection subPropertyItemsCollection = propertyItem.Properties as PropertyItemCollection;
-          if( subPropertyItemsCollection != null )
-          {
-            subPropertyItemsCollection.UpdateCategorization( this.ComputeCategoryGroupDescription(), this.PropertyContainer.IsCategorized, this.PropertyContainer.IsSortedAlphabetically );
-          }
-        }
-      }
-    }
-
-    private GroupDescription ComputeCategoryGroupDescription()
-    {
-      if( !PropertyContainer.IsCategorized )
-        return null;
-      return new PropertyGroupDescription( PropertyItemCollection.CategoryPropertyName );
-    }
-
-    private string GetCategoryGroupingPropertyName()
-    {
-      var propGroup = this.ComputeCategoryGroupDescription() as PropertyGroupDescription;
-      return ( propGroup != null ) ? propGroup.PropertyName : null;
-    }
-
-    private void OnChildrenPropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      if( ObjectContainerHelperBase.IsItemOrderingProperty( e.PropertyName )
-        || this.GetCategoryGroupingPropertyName() == e.PropertyName )
-      {
-        // Refreshing the view while Containers are generated will throw an exception
-        if( this.ChildrenItemsControl.ItemContainerGenerator.Status != GeneratorStatus.GeneratingContainers
-          && !_isPreparingItemFlag )
-        {
-          PropertyItems.RefreshView();
-        }
-      }
-    }
-
-    protected abstract string GetDefaultPropertyName();
-
-    protected abstract IEnumerable<PropertyItem> GenerateSubPropertiesCore();
-
-    private void RegenerateProperties()
-    {
-      IEnumerable<PropertyItem> subProperties = this.GenerateSubPropertiesCore();
-
-      foreach( var propertyItem in subProperties )
-      {
-        this.InitializePropertyItem( propertyItem );
-      }
-
-      //Remove the event callback from the previous children (if any)
-      foreach( var propertyItem in PropertyItems )
-      {
-        propertyItem.PropertyChanged -= OnChildrenPropertyChanged;
-      }
-
-      PropertyItems.UpdateItems( subProperties );
-
-      //Add the event callback to the new childrens
-      foreach( var propertyItem in PropertyItems )
-      {
-        propertyItem.PropertyChanged += OnChildrenPropertyChanged;
-      }
-
-      // Update the selected property on the property grid only.
-      PropertyGrid propertyGrid = PropertyContainer as PropertyGrid;
-      if( propertyGrid != null )
-      {
-        propertyGrid.SelectedPropertyItem = this.DefaultProperty;
-      }
-    }
-
-    protected static List<PropertyDescriptor> GetPropertyDescriptors( object instance, bool hideInheritedProperties )
-    {
-      PropertyDescriptorCollection descriptors;
-
-      TypeConverter tc = TypeDescriptor.GetConverter( instance );
-      if( tc == null || !tc.GetPropertiesSupported() )
-      {
-        if( instance is ICustomTypeDescriptor )
-        {
-          descriptors = ((ICustomTypeDescriptor)instance).GetProperties();
-        }
-        //ICustomTypeProvider is only available in .net 4.5 and over. Use reflection so the .net 4.0 and .net 3.5 still works.
-        else if( instance.GetType().GetInterface( "ICustomTypeProvider", true ) != null )
-        {
-          var methodInfo = instance.GetType().GetMethod( "GetCustomType" );
-          var result = methodInfo.Invoke( instance, null ) as Type;
-          descriptors = TypeDescriptor.GetProperties( result );
-        }
-        else
-        {
-          descriptors = TypeDescriptor.GetProperties( instance.GetType() );
-        }
-      }
-      else
-      {
-        descriptors = tc.GetProperties( instance );
-      }
-
-      if( ( descriptors != null ) )
-      {
-        var descriptorsProperties = descriptors.Cast<PropertyDescriptor>();
-        if( hideInheritedProperties )
-        {
-          var properties = from p in descriptorsProperties
-                           where p.ComponentType == instance.GetType()
-                           select p;
-          return properties.ToList();
-        }
-        else
-        {
-          return descriptorsProperties.ToList();
-        }
-      }
-
-      return null;
-    }
-
-
-
-
-    protected bool GetWillRefreshPropertyGrid( PropertyDescriptor propertyDescriptor )
-    {
-      if( propertyDescriptor == null )
-        return false;
-
-      var attribute = PropertyGridUtilities.GetAttribute<RefreshPropertiesAttribute>( propertyDescriptor );
-      if( attribute != null )
-        return attribute.RefreshProperties != RefreshProperties.None;
-
-      return false;
-    }
-
-    internal void InitializeDescriptorDefinition(
-      DescriptorPropertyDefinitionBase descriptorDef,
-      PropertyDefinition propertyDefinition )
-    {
-      if( descriptorDef == null )
-        throw new ArgumentNullException( "descriptorDef" );
-
-      if( propertyDefinition == null )
-        return;
-
-      // Values defined on PropertyDefinition have priority on the attributes
-      if( propertyDefinition != null )
-      {
-        if( propertyDefinition.Category != null )
-        {
-          descriptorDef.Category = propertyDefinition.Category;
-          descriptorDef.CategoryValue = propertyDefinition.Category;
-        }
-
-        if( propertyDefinition.Description != null )
-        {
-          descriptorDef.Description = propertyDefinition.Description;
-        }
-        if( propertyDefinition.DisplayName != null )
-        {
-          descriptorDef.DisplayName = propertyDefinition.DisplayName;
-        }
-
-        if( propertyDefinition.DisplayOrder != null )
-        {
-          descriptorDef.DisplayOrder = propertyDefinition.DisplayOrder.Value;
-        }
-
-        if( propertyDefinition.IsExpandable != null )
-        {
-          descriptorDef.ExpandableAttribute = propertyDefinition.IsExpandable.Value;
-        }
-      }
-    }
-
-    private void InitializePropertyItem( PropertyItem propertyItem )
-    {
-      DescriptorPropertyDefinitionBase pd = propertyItem.DescriptorDefinition;
-      propertyItem.PropertyDescriptor = pd.PropertyDescriptor;
-
-      propertyItem.IsReadOnly = pd.IsReadOnly;
-      propertyItem.DisplayName = pd.DisplayName;
-      propertyItem.Description = pd.Description;
-
-      propertyItem.Category = pd.Category;
-      propertyItem.PropertyOrder = pd.DisplayOrder;
-
-      //These properties can vary with the value. They need to be bound.
-      if( pd.PropertyDescriptor.Converter is ExpandableObjectConverter )
-      {
-        propertyItem.IsExpandable = true;
-      }
-      else
-      {
-        SetupDefinitionBinding( propertyItem, PropertyItemBase.IsExpandableProperty, pd, () => pd.IsExpandable, BindingMode.OneWay );
-      }
-      SetupDefinitionBinding( propertyItem, PropertyItemBase.AdvancedOptionsIconProperty, pd, () => pd.AdvancedOptionsIcon, BindingMode.OneWay );
-      SetupDefinitionBinding( propertyItem, PropertyItemBase.AdvancedOptionsTooltipProperty, pd, () => pd.AdvancedOptionsTooltip, BindingMode.OneWay );
-      SetupDefinitionBinding( propertyItem, PropertyItem.ValueProperty, pd, () => pd.Value, BindingMode.TwoWay );
-
-      if( pd.CommandBindings != null )
-      {
-        foreach( CommandBinding commandBinding in pd.CommandBindings )
-        {
-          propertyItem.CommandBindings.Add( commandBinding );
-        }
-      }
-
-      // PropertyItem.PropertyType's defaultValue equals current PropertyItem's value => set the DefaultValue attribute
-      if( pd.DefaultValue != null )
-      {
-        var typeDefaultValue = this.GetTypeDefaultValue( propertyItem.PropertyType );
-
-        if( ( (propertyItem.Value != null) && propertyItem.Value.Equals( typeDefaultValue ) )
-              || ( (propertyItem.Value == null) && ( typeDefaultValue == propertyItem.Value ) ) ) 
-        {
-#if VS2008
-        propertyItem.Value = pd.DefaultValue;
-#else
-          propertyItem.SetCurrentValue( PropertyItem.ValueProperty, pd.DefaultValue );
-#endif
-        }
-      }
-    }
-
-    private object GetTypeDefaultValue( Type type )
-    {
-      if( type.IsGenericType && type.GetGenericTypeDefinition() == typeof( Nullable<> ) )
-      {
-        type = type.GetProperty( "Value" ).PropertyType;
-      }
-
-      return ( type.IsValueType ? Activator.CreateInstance( type ) : null ) ;
-    }
-
-    private void SetupDefinitionBinding<T>(
-      PropertyItem propertyItem,
-      DependencyProperty itemProperty,
-      DescriptorPropertyDefinitionBase pd,
-      Expression<Func<T>> definitionProperty,
-      BindingMode bindingMode )
-    {
-      string sourceProperty = ReflectionHelper.GetPropertyOrFieldName( definitionProperty );
-      Binding binding = new Binding( sourceProperty )
-      {
-        Source = pd,
-        Mode = bindingMode
-      };
-
-      propertyItem.SetBinding( itemProperty, binding );
-    }
-
-    internal FrameworkElement GenerateChildrenEditorElement( PropertyItem propertyItem )
-    {
-      FrameworkElement editorElement = null;
-      DescriptorPropertyDefinitionBase pd = propertyItem.DescriptorDefinition;
-      object definitionKey = null;
-      Type definitionKeyAsType = definitionKey as Type;
-      ITypeEditor editor = null;
-
-      if( editor == null )
-        editor = pd.CreateAttributeEditor();
-
-      if( editor != null )
-        editorElement = editor.ResolveEditor( propertyItem );
-
-
-      if( (editorElement == null) && (definitionKey == null) && ( propertyItem.PropertyDescriptor != null ) )
-        editorElement = this.GenerateCustomEditingElement( propertyItem.PropertyDescriptor.Name, propertyItem );
-
-      if( editorElement == null && definitionKeyAsType == null )
-        editorElement = this.GenerateCustomEditingElement( propertyItem.PropertyType, propertyItem );
-
-      if( editorElement == null )
-      {
-        if( pd.IsReadOnly )
-          editor = new TextBlockEditor();
-
-        // Fallback: Use a default type editor.
-        if( editor == null )
-        {
-          editor = ( definitionKeyAsType != null )
-          ? PropertyGridUtilities.CreateDefaultEditor( definitionKeyAsType, null, propertyItem )
-          : pd.CreateDefaultEditor( propertyItem );
-        }
-
-        Debug.Assert( editor != null );
-
-        editorElement = editor.ResolveEditor( propertyItem );
-      }
-
-      return editorElement;
-    }
-
-    internal PropertyDefinition GetPropertyDefinition( PropertyDescriptor descriptor )
-    {
-      PropertyDefinition def = null;
-
-      var propertyDefs = this.PropertyContainer.PropertyDefinitions;
-      if( propertyDefs != null )
-      {
-        def = propertyDefs[ descriptor.Name ];
-        if( def == null )
-        {
-          def = propertyDefs.GetRecursiveBaseTypes( descriptor.PropertyType );
-        }
-      }
-
-      return def;
-    }
-
-
-    public override void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, object item )
-    {
-      _isPreparingItemFlag = true;
-      base.PrepareChildrenPropertyItem( propertyItem, item );
-
-      if( propertyItem.Editor == null )
-      {
-        FrameworkElement editor = this.GenerateChildrenEditorElement( ( PropertyItem )propertyItem );
-        if( editor != null )
-        {
-          // Tag the editor as generated to know if we should clear it.
-          ContainerHelperBase.SetIsGenerated( editor, true );
-          propertyItem.Editor = editor;
-        }
-      }
-      _isPreparingItemFlag = false;
-    }
-
-    public override void ClearChildrenPropertyItem( PropertyItemBase propertyItem, object item )
-    {
-      if( propertyItem.Editor != null 
-        && ContainerHelperBase.GetIsGenerated( propertyItem.Editor ) )
-      {
-        propertyItem.Editor = null;
-      }
-
-      base.ClearChildrenPropertyItem( propertyItem, item );
-    }
-
-    public override Binding CreateChildrenDefaultBinding( PropertyItemBase propertyItem )
-    {
-      Binding binding = new Binding( "Value" );
-      binding.Mode = ( ( ( PropertyItem )propertyItem ).IsReadOnly ) ? BindingMode.OneWay : BindingMode.TwoWay;
-      return binding;
-    }
-
-    protected static string GetDefaultPropertyName( object instance )
-    {
-      AttributeCollection attributes = TypeDescriptor.GetAttributes( instance );
-      DefaultPropertyAttribute defaultPropertyAttribute = ( DefaultPropertyAttribute )attributes[ typeof( DefaultPropertyAttribute ) ];
-      return defaultPropertyAttribute != null ? defaultPropertyAttribute.Name : null;
-    }
-
-    private static bool IsItemOrderingProperty( string propertyName )
-    {
-      return string.Equals( propertyName, PropertyItemCollection.DisplayNamePropertyName )
-        || string.Equals( propertyName, PropertyItemCollection.CategoryOrderPropertyName )
-        || string.Equals( propertyName, PropertyItemCollection.PropertyOrderPropertyName );
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
deleted file mode 100644
index 01b51efb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class PropertyDefinition : PropertyDefinitionBase
-  {
-    private string _name;
-    private bool? _isBrowsable = true;
-    private bool? _isExpandable = null;
-    private string _displayName = null;
-    private string _description = null;
-    private string _category = null;
-    private int? _displayOrder = null;
-
-    [Obsolete(@"Use 'TargetProperties' instead of 'Name'")]
-    public string Name
-    {
-      get { return _name; }
-      set 
-      {
-        const string usageError = "{0}: \'Name\' property is obsolete. Instead use \'TargetProperties\'. (XAML example: <t:PropertyDefinition TargetProperties=\"FirstName,LastName\" />)";
-        System.Diagnostics.Trace.TraceWarning( usageError, typeof( PropertyDefinition ) );
-        _name = value; 
-      }
-    }
-
-    public string Category
-    {
-      get { return _category; }
-      set 
-      {
-        this.ThrowIfLocked( () => this.Category );
-        _category = value; 
-      }
-    }
-
-    public string DisplayName
-    {
-      get { return _displayName; }
-      set
-      {
-        this.ThrowIfLocked( () => this.DisplayName );
-        _displayName = value;
-      }
-    }
-
-    public string Description
-    {
-      get { return _description; }
-      set
-      {
-        this.ThrowIfLocked( () => this.Description );
-        _description = value;
-      }
-    }
-
-    public int? DisplayOrder
-    {
-      get { return _displayOrder; }
-      set
-      {
-        this.ThrowIfLocked( () => this.DisplayOrder );
-        _displayOrder = value;
-      }
-    }
-
-    public bool? IsBrowsable
-    {
-      get { return _isBrowsable; }
-      set
-      {
-        this.ThrowIfLocked( () => this.IsBrowsable );
-        _isBrowsable = value;
-      }
-    }
-
-    public bool? IsExpandable
-    {
-      get { return _isExpandable; }
-      set
-      {
-        this.ThrowIfLocked( () => this.IsExpandable );
-        _isExpandable = value;
-      }
-    }
-
-    internal override void Lock()
-    {
-      if( _name != null
-        && this.TargetProperties != null
-        && this.TargetProperties.Count > 0 )
-      {
-        throw new InvalidOperationException(
-          string.Format(
-            @"{0}: When using 'TargetProperties' property, do not use 'Name' property.", 
-            typeof( PropertyDefinition ) ) );
-      }
-
-      if( _name != null )
-      {
-        this.TargetProperties = new List<object>() { _name };
-      }
-      base.Lock();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
deleted file mode 100644
index 67c90df6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class PropertyDefinitionCollection : PropertyDefinitionBaseCollection<PropertyDefinition>
-  {
-  }
-  public class EditorDefinitionCollection : PropertyDefinitionBaseCollection<EditorDefinitionBase>
-  {
-  }
-
-
-  public abstract class PropertyDefinitionBaseCollection<T> : DefinitionCollectionBase<T> where T : PropertyDefinitionBase
-  {
-    protected PropertyDefinitionBaseCollection()
-    {
-    }
-
-    public virtual T this[ object propertyId ]
-    {
-      get
-      {
-        foreach( var item in Items )
-        {
-          if( item.TargetProperties.Contains( propertyId ) )
-            return item;
-
-          // Using the special character "*" in a string of TargetProperties will
-          // return all the items containing the string (before or after) the "*".
-          // ex : Prop* will return properties named Prop1, Prop2, Prop3...
-          List<string> stringTargetProperties = item.TargetProperties.OfType<string>().ToList();
-          if( ( stringTargetProperties != null ) && ( stringTargetProperties.Count > 0 ) )
-          {
-            if( propertyId is string )
-            {
-              string stringPropertyID = ( string )propertyId;
-              foreach( var targetPropertyString in stringTargetProperties )
-              {
-                if( targetPropertyString.Contains( "*" ) )
-                {
-                  string searchString = targetPropertyString.Replace( "*", "" );
-                  if( stringPropertyID.StartsWith( searchString ) || stringPropertyID.EndsWith( searchString ) )
-                    return item;
-                }
-              }
-            }
-          }
-          else
-          {
-            //Manage Interfaces
-            var type = propertyId as Type;
-            if( type != null )
-            {
-              foreach( Type targetProperty in item.TargetProperties )
-              {
-                if( targetProperty.IsAssignableFrom( type ) )
-                  return item;
-              }
-            }
-          }
-        }
-
-        return null;
-      }
-    }
-
-    internal T GetRecursiveBaseTypes( Type type )
-    {
-      // If no definition for the current type, fall back on base type editor recursively.
-      T ret = null;
-      while( ret == null && type != null )
-      {
-        ret = this[ type ];
-        type = type.BaseType;
-      }
-      return ret;
-    }
-  }
-
-  public abstract class DefinitionCollectionBase<T> : ObservableCollection<T> where T : DefinitionBase
-  {
-    internal DefinitionCollectionBase()
-    {
-    }
-
-    protected override void InsertItem( int index, T item )
-    {
-      if( item == null )
-        throw new InvalidOperationException( @"Cannot insert null items in the collection." );
-
-      item.Lock();
-      base.InsertItem( index, item );
-    }
-
-    protected override void SetItem( int index, T item )
-    {
-      if( item == null )
-        throw new InvalidOperationException( @"Cannot insert null items in the collection." );
-
-      item.Lock();
-      base.SetItem( index, item );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
deleted file mode 100644
index ff4ee52a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
+++ /dev/null
@@ -1,1599 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using System.Collections.Specialized;
-using System.Windows.Media;
-using System.Collections.ObjectModel;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  [TemplatePart( Name = PART_DragThumb, Type = typeof( Thumb ) )]
-  [TemplatePart( Name = PART_PropertyItemsControl, Type = typeof( PropertyItemsControl ) )]
-  [StyleTypedProperty( Property = "PropertyContainerStyle", StyleTargetType = typeof( PropertyItemBase ) )]
-  public class PropertyGrid : Control, ISupportInitialize, IPropertyContainer, INotifyPropertyChanged
-  {
-    private const string PART_DragThumb = "PART_DragThumb";
-    internal const string PART_PropertyItemsControl = "PART_PropertyItemsControl";
-    private static readonly ComponentResourceKey SelectedObjectAdvancedOptionsMenuKey = new ComponentResourceKey( typeof( PropertyGrid ), "SelectedObjectAdvancedOptionsMenu" );
-
-    #region Members
-
-    private Thumb _dragThumb;
-    private bool _hasPendingSelectedObjectChanged;
-    private int _initializationCount;
-    private ContainerHelperBase _containerHelper;
-    private PropertyDefinitionCollection _propertyDefinitions;
-    private WeakEventListener<NotifyCollectionChangedEventArgs> _propertyDefinitionsListener;
-    private WeakEventListener<NotifyCollectionChangedEventArgs> _editorDefinitionsListener;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region AdvancedOptionsMenu
-
-    public static readonly DependencyProperty AdvancedOptionsMenuProperty = DependencyProperty.Register( "AdvancedOptionsMenu", typeof( ContextMenu ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
-    public ContextMenu AdvancedOptionsMenu
-    {
-      get
-      {
-        return ( ContextMenu )GetValue( AdvancedOptionsMenuProperty );
-      }
-      set
-      {
-        SetValue( AdvancedOptionsMenuProperty, value );
-      }
-    }
-
-    #endregion //AdvancedOptionsMenu
-
-    #region AutoGenerateProperties
-
-    public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register( "AutoGenerateProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool AutoGenerateProperties
-    {
-      get
-      {
-        return ( bool )GetValue( AutoGeneratePropertiesProperty );
-      }
-      set
-      {
-        SetValue( AutoGeneratePropertiesProperty, value );
-      }
-    }
-
-    #endregion //AutoGenerateProperties
-
-    #region ShowDescriptionByTooltip
-
-    public static readonly DependencyProperty ShowDescriptionByTooltipProperty = DependencyProperty.Register( "ShowDescriptionByTooltip", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool ShowDescriptionByTooltip
-    {
-      get
-      {
-        return ( bool )GetValue( ShowDescriptionByTooltipProperty );
-      }
-      set
-      {
-        SetValue( ShowDescriptionByTooltipProperty, value );
-      }
-    }
-
-    #endregion //ShowDescriptionByTooltip
-
-    #region ShowSummary
-
-    public static readonly DependencyProperty ShowSummaryProperty = DependencyProperty.Register( "ShowSummary", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowSummary
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSummaryProperty );
-      }
-      set
-      {
-        SetValue( ShowSummaryProperty, value );
-      }
-    }
-
-    #endregion //ShowSummary
-
-    #region EditorDefinitions
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( PropertyGrid )
-      , new UIPropertyMetadata( null, OnEditorDefinitionsChanged ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    private static void OnEditorDefinitionsChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnEditorDefinitionsChanged( ( EditorDefinitionCollection )e.OldValue, ( EditorDefinitionCollection )e.NewValue );
-    }
-
-    protected virtual void OnEditorDefinitionsChanged( EditorDefinitionCollection oldValue, EditorDefinitionCollection newValue )
-    {
-      if( oldValue != null )
-        CollectionChangedEventManager.RemoveListener( oldValue, _editorDefinitionsListener );
-
-      if( newValue != null )
-        CollectionChangedEventManager.AddListener( newValue, _editorDefinitionsListener );
-
-      this.Notify( this.PropertyChanged, () => this.EditorDefinitions );
-    }
-
-    private void OnEditorDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.NotifyEditorDefinitionsCollectionChanged();
-      }
-    }
-
-    #endregion //EditorDefinitions
-
-    #region Filter
-
-    public static readonly DependencyProperty FilterProperty = DependencyProperty.Register( "Filter", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnFilterChanged ) );
-    public string Filter
-    {
-      get
-      {
-        return ( string )GetValue( FilterProperty );
-      }
-      set
-      {
-        SetValue( FilterProperty, value );
-      }
-    }
-
-    private static void OnFilterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnFilterChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnFilterChanged( string oldValue, string newValue )
-    {
-      // The Filter property affects the resulting FilterInfo of IPropertyContainer. Raise an event corresponding
-      // to this property.
-      this.Notify( this.PropertyChanged, () => ( ( IPropertyContainer )this ).FilterInfo );
-    }
-
-    #endregion //Filter
-
-    #region FilterWatermark
-
-    public static readonly DependencyProperty FilterWatermarkProperty = DependencyProperty.Register( "FilterWatermark", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( "Search" ) );
-    public string FilterWatermark
-    {
-      get
-      {
-        return ( string )GetValue( FilterWatermarkProperty );
-      }
-      set
-      {
-        SetValue( FilterWatermarkProperty, value );
-      }
-    }
-
-    #endregion //FilterWatermark
-
-    #region HideInheritedProperties
-
-    public static readonly DependencyProperty HideInheritedPropertiesProperty = DependencyProperty.Register( "HideInheritedProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool HideInheritedProperties
-    {
-      get
-      {
-        return ( bool )GetValue( HideInheritedPropertiesProperty );
-      }
-      set
-      {
-        SetValue( HideInheritedPropertiesProperty, value );
-      }
-    }
-
-    #endregion //HideInheritedProperties
-
-    #region IsCategorized
-
-    public static readonly DependencyProperty IsCategorizedProperty = DependencyProperty.Register( "IsCategorized", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true, OnIsCategorizedChanged ) );
-    public bool IsCategorized
-    {
-      get
-      {
-        return ( bool )GetValue( IsCategorizedProperty );
-      }
-      set
-      {
-        SetValue( IsCategorizedProperty, value );
-      }
-    }
-
-    private static void OnIsCategorizedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnIsCategorizedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsCategorizedChanged( bool oldValue, bool newValue )
-    {
-      this.UpdateThumb();
-    }
-
-    #endregion //IsCategorized
-
-    #region IsMiscCategoryLabelHidden
-
-    public static readonly DependencyProperty IsMiscCategoryLabelHiddenProperty = DependencyProperty.Register( "IsMiscCategoryLabelHidden", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool IsMiscCategoryLabelHidden
-    {
-      get
-      {
-        return ( bool )GetValue( IsMiscCategoryLabelHiddenProperty );
-      }
-      set
-      {
-        SetValue( IsMiscCategoryLabelHiddenProperty, value );
-      }
-    }
-
-    #endregion //IsMiscCategoryLabelHidden
-
-    #region IsScrollingToTopAfterRefresh
-
-    public static readonly DependencyProperty IsScrollingToTopAfterRefreshProperty = DependencyProperty.Register( "IsScrollingToTopAfterRefresh", typeof( bool ), typeof( PropertyGrid )
-      , new UIPropertyMetadata( true ) );
-    public bool IsScrollingToTopAfterRefresh
-    {
-      get
-      {
-        return ( bool )GetValue( IsScrollingToTopAfterRefreshProperty );
-      }
-      set
-      {
-        SetValue( IsScrollingToTopAfterRefreshProperty, value );
-      }
-    }
-
-    #endregion //IsScrollingToTopAfterRefresh
-
-    #region IsVirtualizing
-
-    public static readonly DependencyProperty IsVirtualizingProperty = DependencyProperty.Register( "IsVirtualizing", typeof( bool ), typeof( PropertyGrid )
-      , new UIPropertyMetadata( false, OnIsVirtualizingChanged ) );
-    public bool IsVirtualizing
-    {
-      get
-      {
-        return ( bool )GetValue( IsVirtualizingProperty );
-      }
-      set
-      {
-        SetValue( IsVirtualizingProperty, value );
-      }
-    }
-
-    private static void OnIsVirtualizingChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnIsVirtualizingChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsVirtualizingChanged( bool oldValue, bool newValue )
-    {
-      this.UpdateContainerHelper();
-    }
-
-    #endregion //IsVirtualizing
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    #region NameColumnWidth
-
-    public static readonly DependencyProperty NameColumnWidthProperty = DependencyProperty.Register( "NameColumnWidth", typeof( double ), typeof( PropertyGrid ), new UIPropertyMetadata( 150.0, OnNameColumnWidthChanged ) );
-    public double NameColumnWidth
-    {
-      get
-      {
-        return ( double )GetValue( NameColumnWidthProperty );
-      }
-      set
-      {
-        SetValue( NameColumnWidthProperty, value );
-      }
-    }
-
-    private static void OnNameColumnWidthChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnNameColumnWidthChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    protected virtual void OnNameColumnWidthChanged( double oldValue, double newValue )
-    {
-      if( _dragThumb != null )
-        ( ( TranslateTransform )_dragThumb.RenderTransform ).X = newValue;
-    }
-
-    #endregion //NameColumnWidth
-
-    #region Properties
-
-    public IList Properties
-    {
-      get
-      {
-        return (_containerHelper != null) ? _containerHelper.Properties : null;
-      }
-    }
-
-    #endregion //Properties
-
-
-
-
-
-
-
-
-    #region PropertyContainerStyle
-
-    /// <summary>
-    /// Identifies the PropertyContainerStyle dependency property
-    /// </summary>
-    public static readonly DependencyProperty PropertyContainerStyleProperty =
-        DependencyProperty.Register( "PropertyContainerStyle", typeof( Style ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnPropertyContainerStyleChanged ) );
-
-    /// <summary>
-    /// Gets or sets the style that will be applied to all PropertyItemBase instances displayed in the property grid.
-    /// </summary>
-    public Style PropertyContainerStyle
-    {
-      get { return ( Style )GetValue( PropertyContainerStyleProperty ); }
-      set { SetValue( PropertyContainerStyleProperty, value ); }
-    }
-
-    private static void OnPropertyContainerStyleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var owner = o as PropertyGrid;
-      if( owner != null )
-        owner.OnPropertyContainerStyleChanged( ( Style )e.OldValue, ( Style )e.NewValue );
-    }
-
-    protected virtual void OnPropertyContainerStyleChanged( Style oldValue, Style newValue )
-    {
-    }
-
-    #endregion //PropertyContainerStyle
-
-    #region PropertyDefinitions
-
-    public PropertyDefinitionCollection PropertyDefinitions
-    {
-      get
-      {
-        return _propertyDefinitions;
-      }
-      set
-      {
-        if( _propertyDefinitions != value )
-        {
-          PropertyDefinitionCollection oldValue = _propertyDefinitions;
-          _propertyDefinitions = value;
-          this.OnPropertyDefinitionsChanged( oldValue, value );
-        }
-      }
-    }
-
-    protected virtual void OnPropertyDefinitionsChanged( PropertyDefinitionCollection oldValue, PropertyDefinitionCollection newValue )
-    {
-      if( oldValue != null )
-        CollectionChangedEventManager.RemoveListener( oldValue, _propertyDefinitionsListener );
-
-      if( newValue != null )
-        CollectionChangedEventManager.AddListener( newValue, _propertyDefinitionsListener );
-
-      this.Notify( this.PropertyChanged, () => this.PropertyDefinitions );
-    }
-
-    private void OnPropertyDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.NotifyPropertyDefinitionsCollectionChanged();
-      }
-      if( this.IsLoaded )
-      {
-        this.UpdateContainerHelper();
-      }
-    }
-
-    #endregion //PropertyDefinitions
-
-    #region IsReadOnly
-
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-
-    #endregion //ReadOnly
-
-    #region SelectedObject
-
-    public static readonly DependencyProperty SelectedObjectProperty = DependencyProperty.Register( "SelectedObject", typeof( object ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectChanged ) );
-    public object SelectedObject
-    {
-      get
-      {
-        return ( object )GetValue( SelectedObjectProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectProperty, value );
-      }
-    }
-
-    private static void OnSelectedObjectChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyInspector = o as PropertyGrid;
-      if( propertyInspector != null )
-        propertyInspector.OnSelectedObjectChanged( ( object )e.OldValue, ( object )e.NewValue );
-    }
-
-    protected virtual void OnSelectedObjectChanged( object oldValue, object newValue )
-    {
-      // We do not want to process the change now if the grid is initializing (ie. BeginInit/EndInit).
-      if( _initializationCount != 0 )
-      {
-        _hasPendingSelectedObjectChanged = true;
-        return;
-      }
-
-      this.UpdateContainerHelper();
-
-      RaiseEvent( new RoutedPropertyChangedEventArgs<object>( oldValue, newValue, PropertyGrid.SelectedObjectChangedEvent ) );
-    }
-
-    #endregion //SelectedObject
-
-    #region SelectedObjectType
-
-    public static readonly DependencyProperty SelectedObjectTypeProperty = DependencyProperty.Register( "SelectedObjectType", typeof( Type ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectTypeChanged ) );
-    public Type SelectedObjectType
-    {
-      get
-      {
-        return ( Type )GetValue( SelectedObjectTypeProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectTypeProperty, value );
-      }
-    }
-
-    private static void OnSelectedObjectTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnSelectedObjectTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
-    }
-
-    protected virtual void OnSelectedObjectTypeChanged( Type oldValue, Type newValue )
-    {
-    }
-
-    #endregion //SelectedObjectType
-
-    #region SelectedObjectTypeName
-
-    public static readonly DependencyProperty SelectedObjectTypeNameProperty = DependencyProperty.Register( "SelectedObjectTypeName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty ) );
-    public string SelectedObjectTypeName
-    {
-      get
-      {
-        return ( string )GetValue( SelectedObjectTypeNameProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectTypeNameProperty, value );
-      }
-    }
-
-    #endregion //SelectedObjectTypeName
-
-    #region SelectedObjectName
-
-    public static readonly DependencyProperty SelectedObjectNameProperty = DependencyProperty.Register( "SelectedObjectName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty, OnSelectedObjectNameChanged, OnCoerceSelectedObjectName ) );
-    public string SelectedObjectName
-    {
-      get
-      {
-        return ( string )GetValue( SelectedObjectNameProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectNameProperty, value );
-      }
-    }
-
-    private static object OnCoerceSelectedObjectName( DependencyObject o, object baseValue )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-      {
-        if( (propertyGrid.SelectedObject is FrameworkElement) && ( String.IsNullOrEmpty( ( String )baseValue ) ))
-          return "<no name>";
-      }
-
-      return baseValue;
-    }
-
-    private static void OnSelectedObjectNameChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.SelectedObjectNameChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void SelectedObjectNameChanged( string oldValue, string newValue )
-    {
-    }
-
-    #endregion //SelectedObjectName
-
-
-
-
-
-
-
-
-
-
-
-
-    #region SelectedPropertyItem
-
-    private static readonly DependencyPropertyKey SelectedPropertyItemPropertyKey = DependencyProperty.RegisterReadOnly( "SelectedPropertyItem", typeof( PropertyItemBase ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyItemChanged ) );
-    public static readonly DependencyProperty SelectedPropertyItemProperty = SelectedPropertyItemPropertyKey.DependencyProperty;
-    public PropertyItemBase SelectedPropertyItem
-    {
-      get
-      {
-        return ( PropertyItemBase )GetValue( SelectedPropertyItemProperty );
-      }
-      internal set
-      {
-        SetValue( SelectedPropertyItemPropertyKey, value );
-      }
-    }
-
-    private static void OnSelectedPropertyItemChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnSelectedPropertyItemChanged( ( PropertyItemBase )e.OldValue, ( PropertyItemBase )e.NewValue );
-    }
-
-    protected virtual void OnSelectedPropertyItemChanged( PropertyItemBase oldValue, PropertyItemBase newValue )
-    {
-      if( oldValue != null )
-        oldValue.IsSelected = false;
-
-      if( newValue != null )
-        newValue.IsSelected = true;
-
-      this.SelectedProperty = ( (newValue != null) && (_containerHelper != null) ) ? _containerHelper.ItemFromContainer( newValue ) : null;
-
-      RaiseEvent( new RoutedPropertyChangedEventArgs<PropertyItemBase>( oldValue, newValue, PropertyGrid.SelectedPropertyItemChangedEvent ) );
-    }
-
-    #endregion //SelectedPropertyItem
-
-    #region SelectedProperty
-
-    /// <summary>
-    /// Identifies the SelectedProperty dependency property
-    /// </summary>
-    public static readonly DependencyProperty SelectedPropertyProperty =
-        DependencyProperty.Register( "SelectedProperty", typeof( object ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyChanged ) );
-
-    /// <summary>
-    /// Gets or sets the selected property or returns null if the selection is empty.
-    /// </summary>
-    public object SelectedProperty
-    {
-      get { return ( object )GetValue( SelectedPropertyProperty ); }
-      set { SetValue( SelectedPropertyProperty, value ); }
-    }
-
-    private static void OnSelectedPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      PropertyGrid propertyGrid = sender as PropertyGrid;
-      if( propertyGrid != null )
-      {
-        propertyGrid.OnSelectedPropertyChanged( ( object )args.OldValue, ( object )args.NewValue );
-      }
-    }
-
-    private void OnSelectedPropertyChanged( object oldValue, object newValue )
-    {
-      // Do not update the SelectedPropertyItem if the Current SelectedPropertyItem
-      // item is the same as the new SelectedProperty. There may be 
-      // duplicate items and the result could be to change the selection to the wrong item.
-      if( _containerHelper != null )
-      {
-        object currentSelectedProperty = _containerHelper.ItemFromContainer( this.SelectedPropertyItem );
-        if( !object.Equals( currentSelectedProperty, newValue ) )
-        {
-          this.SelectedPropertyItem = _containerHelper.ContainerFromItem( newValue );
-        }
-      }
-    }
-
-    #endregion //SelectedProperty
-
-    #region ShowAdvancedOptions
-
-    public static readonly DependencyProperty ShowAdvancedOptionsProperty = DependencyProperty.Register( "ShowAdvancedOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool ShowAdvancedOptions
-    {
-      get
-      {
-        return ( bool )GetValue( ShowAdvancedOptionsProperty );
-      }
-      set
-      {
-        SetValue( ShowAdvancedOptionsProperty, value );
-      }
-    }
-
-    #endregion //ShowAdvancedOptions
-
-    #region ShowHorizontalScrollBar
-
-    public static readonly DependencyProperty ShowHorizontalScrollBarProperty = DependencyProperty.Register( "ShowHorizontalScrollBar", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool ShowHorizontalScrollBar
-    {
-      get
-      {
-        return ( bool )GetValue( ShowHorizontalScrollBarProperty );
-      }
-      set
-      {
-        SetValue( ShowHorizontalScrollBarProperty, value );
-      }
-    }
-
-    #endregion //ShowHorizontalScrollBar
-
-    #region ShowPreview
-
-    public static readonly DependencyProperty ShowPreviewProperty = DependencyProperty.Register( "ShowPreview", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool ShowPreview
-    {
-      get
-      {
-        return ( bool )GetValue( ShowPreviewProperty );
-      }
-      set
-      {
-        SetValue( ShowPreviewProperty, value );
-      }
-    }
-
-    #endregion //ShowPreview
-
-    #region ShowSearchBox
-
-    public static readonly DependencyProperty ShowSearchBoxProperty = DependencyProperty.Register( "ShowSearchBox", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowSearchBox
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSearchBoxProperty );
-      }
-      set
-      {
-        SetValue( ShowSearchBoxProperty, value );
-      }
-    }
-
-    #endregion //ShowSearchBox
-
-    #region ShowSortOptions
-
-    public static readonly DependencyProperty ShowSortOptionsProperty = DependencyProperty.Register( "ShowSortOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowSortOptions
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSortOptionsProperty );
-      }
-      set
-      {
-        SetValue( ShowSortOptionsProperty, value );
-      }
-    }
-
-    #endregion //ShowSortOptions
-
-    #region ShowTitle
-
-    public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register( "ShowTitle", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowTitle
-    {
-      get
-      {
-        return ( bool )GetValue( ShowTitleProperty );
-      }
-      set
-      {
-        SetValue( ShowTitleProperty, value );
-      }
-    }
-
-    #endregion //ShowTitle
-
-    #region UpdateTextBoxSourceOnEnterKey
-
-    public static readonly DependencyProperty UpdateTextBoxSourceOnEnterKeyProperty = DependencyProperty.Register( "UpdateTextBoxSourceOnEnterKey", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool UpdateTextBoxSourceOnEnterKey
-    {
-      get
-      {
-        return ( bool )GetValue( UpdateTextBoxSourceOnEnterKeyProperty );
-      }
-      set
-      {
-        SetValue( UpdateTextBoxSourceOnEnterKeyProperty, value );
-      }
-    }
-
-    #endregion //UpdateTextBoxSourceOnEnterKey
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static PropertyGrid()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGrid ), new FrameworkPropertyMetadata( typeof( PropertyGrid ) ) );
-    }
-
-    public PropertyGrid()
-    {
-      _propertyDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnPropertyDefinitionsCollectionChanged );
-      _editorDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnEditorDefinitionsCollectionChanged);     
-      UpdateContainerHelper();
-#if VS2008
-        EditorDefinitions = new EditorDefinitionCollection();
-#else
-      this.SetCurrentValue( PropertyGrid.EditorDefinitionsProperty, new EditorDefinitionCollection() );
-#endif
-
-      PropertyDefinitions = new PropertyDefinitionCollection();      
-      this.PropertyValueChanged += this.PropertyGrid_PropertyValueChanged;
-
-      AddHandler( PropertyItemBase.ItemSelectionChangedEvent, new RoutedEventHandler( OnItemSelectionChanged ) );
-      AddHandler( PropertyItemsControl.PreparePropertyItemEvent, new PropertyItemEventHandler( OnPreparePropertyItemInternal ) );
-      AddHandler( PropertyItemsControl.ClearPropertyItemEvent, new PropertyItemEventHandler( OnClearPropertyItemInternal ) );
-      CommandBindings.Add( new CommandBinding( PropertyGridCommands.ClearFilter, ClearFilter, CanClearFilter ) );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _dragThumb != null )
-        _dragThumb.DragDelta -= DragThumb_DragDelta;
-      _dragThumb = GetTemplateChild( PART_DragThumb ) as Thumb;
-      if( _dragThumb != null )
-        _dragThumb.DragDelta += DragThumb_DragDelta;
-
-      if( _containerHelper != null )
-      {
-        _containerHelper.ChildrenItemsControl = GetTemplateChild( PART_PropertyItemsControl ) as PropertyItemsControl;
-      }
-
-      //Update TranslateTransform in code-behind instead of XAML to remove the
-      //output window error.
-      //When we use FindAncesstor in custom control template for binding internal elements property 
-      //into its ancestor element, Visual Studio displays data warning messages in output window when 
-      //binding engine meets unmatched target type during visual tree traversal though it does the proper 
-      //binding when it receives expected target type during visual tree traversal
-      //ref : http://www.codeproject.com/Tips/124556/How-to-suppress-the-System-Windows-Data-Error-warn
-      TranslateTransform _moveTransform = new TranslateTransform();
-      _moveTransform.X = NameColumnWidth;
-      if( _dragThumb != null )
-      {
-        _dragThumb.RenderTransform = _moveTransform;
-      }
-
-      this.UpdateThumb();
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      var textBox = e.OriginalSource as TextBox;
-
-      //hitting enter on textbox will update value of underlying source if UpdateTextBoxSourceOnEnterKey is true
-      if( (this.SelectedPropertyItem != null) 
-          && (e.Key == Key.Enter)
-          && this.UpdateTextBoxSourceOnEnterKey
-          && (textBox != null)
-          && !textBox.AcceptsReturn )
-      {
-        BindingExpression be = textBox.GetBindingExpression( TextBox.TextProperty );
-        if( be != null )
-          be.UpdateSource();
-      }
-    }
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      // First check that the raised property is actually a real CLR property.
-      // This could be something else like a Attached DP.
-      if( ReflectionHelper.IsPublicInstanceProperty( GetType(), e.Property.Name ) )
-      {
-        this.Notify( this.PropertyChanged, e.Property.Name );
-      }
-    }
-
-
-#endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void OnItemSelectionChanged( object sender, RoutedEventArgs args )
-    {
-      PropertyItemBase item = ( PropertyItemBase )args.OriginalSource;
-      if( item.IsSelected )
-      {
-        SelectedPropertyItem = item;
-      }
-      else
-      {
-        if( object.ReferenceEquals( item, SelectedPropertyItem ) )
-        {
-          SelectedPropertyItem = null;
-        }
-      }
-    }
-
-    private void OnPreparePropertyItemInternal( object sender, PropertyItemEventArgs args )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.PrepareChildrenPropertyItem( args.PropertyItem, args.Item );
-      }
-      args.Handled = true;
-    }
-
-    private void OnClearPropertyItemInternal( object sender, PropertyItemEventArgs args )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.ClearChildrenPropertyItem( args.PropertyItem, args.Item );
-      }
-      args.Handled = true;
-    }
-
-    private void DragThumb_DragDelta( object sender, DragDeltaEventArgs e )
-    {
-      NameColumnWidth = Math.Min( Math.Max( this.ActualWidth * 0.1, NameColumnWidth + e.HorizontalChange ), this.ActualWidth * 0.9 );
-    }
-
-
-    private void PropertyGrid_PropertyValueChanged( object sender, PropertyValueChangedEventArgs e )
-    {
-      var modifiedPropertyItem = e.OriginalSource as PropertyItem;
-      if( modifiedPropertyItem != null )
-      {
-        // Need to refresh the PropertyGrid Properties.
-        if( modifiedPropertyItem.WillRefreshPropertyGrid )
-        {
-          // Refresh the PropertyGrid...this will set the initial Categories states.
-          this.UpdateContainerHelper();
-        }
-
-        var parentPropertyItem = modifiedPropertyItem.ParentNode as PropertyItem;
-        if( ( parentPropertyItem != null ) && parentPropertyItem.IsExpandable )
-        {
-          //Rebuild Editor for parent propertyItem if one of its sub-propertyItem have changed.
-          this.RebuildEditor( parentPropertyItem );
-        }
-      }
-    }
-
-
-    #endregion //Event Handlers
-
-    #region Commands
-
-    private void ClearFilter( object sender, ExecutedRoutedEventArgs e )
-    {
-      Filter = String.Empty;
-    }
-
-    private void CanClearFilter( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = !String.IsNullOrEmpty( Filter );
-    }
-
-    #endregion //Commands
-
-    #region Methods
-
-
-
-
-
-
-
-
-
-
-
-
-    public double GetScrollPosition()
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        return scrollViewer.VerticalOffset;
-      }
-      return 0d;
-    }
-
-    public void ScrollToPosition( double position )
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        scrollViewer.ScrollToVerticalOffset( position );
-      }
-    }
-
-    public void ScrollToTop()
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        scrollViewer.ScrollToTop();
-      }
-    }
-
-    public void ScrollToBottom()
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        scrollViewer.ScrollToBottom();
-      }
-    }
-
-    public void CollapseAllProperties()
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( false );
-      }
-    }
-
-    public void ExpandAllProperties()
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( true );
-      }
-    }
-
-    public void ExpandProperty( string propertyName )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( propertyName, true );
-      }
-    }
-
-    public void CollapseProperty( string propertyName )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( propertyName, false );
-      }
-    }
-
-    private ScrollViewer GetScrollViewer()
-    {
-      if( (_containerHelper != null) && (_containerHelper.ChildrenItemsControl != null) )
-      {
-        return TreeHelper.FindChild<ScrollViewer>( _containerHelper.ChildrenItemsControl );
-      }
-      return null;
-    }
-
-    private void RebuildEditor( PropertyItem propertyItem )
-    {
-      ObjectContainerHelperBase objectContainerHelperBase = propertyItem.ContainerHelper as ObjectContainerHelperBase;
-      //Re-build the editor to update this propertyItem
-      FrameworkElement editor = objectContainerHelperBase.GenerateChildrenEditorElement( propertyItem );
-      if( editor != null )
-      {
-        // Tag the editor as generated to know if we should clear it.
-        ContainerHelperBase.SetIsGenerated( editor, true );
-        propertyItem.Editor = editor;
-
-        //Update Source of binding and Validation of PropertyItem to update
-        var be = propertyItem.GetBindingExpression( PropertyItem.ValueProperty );
-        if( be != null )
-        {
-          be.UpdateSource();
-          propertyItem.SetRedInvalidBorder( be );
-        }
-      }
-    }
-
-    private void UpdateContainerHelper()
-    {
-      // Keep a backup of the template element and initialize the
-      // new helper with it.
-      ItemsControl childrenItemsControl = null;
-      if( _containerHelper != null )
-      {
-        childrenItemsControl = _containerHelper.ChildrenItemsControl;
-        _containerHelper.ClearHelper();
-        if( _containerHelper is ObjectContainerHelperBase )
-        {
-          // If the actual AdvancedOptionMenu is the default menu for selected object, 
-          // remove it. Otherwise, it is a custom menu provided by the user.
-          // This "default" menu is only valid for the SelectedObject[s] case. Otherwise, 
-          // it is useless and we must remove it.
-          //var defaultAdvancedMenu = (ContextMenu)this.FindResource( PropertyGrid.SelectedObjectAdvancedOptionsMenuKey );
-          //if( this.AdvancedOptionsMenu == defaultAdvancedMenu )
-          //{
-            this.AdvancedOptionsMenu = null;
-          //}
-        }
-      }
-
-
-
-
-      if( SelectedObject != null )
-      {
-        _containerHelper = new ObjectContainerHelper( this, SelectedObject );
-        ( ( ObjectContainerHelper )_containerHelper ).GenerateProperties();
-      }
-
-
-      if( _containerHelper != null )
-      {
-        _containerHelper.ChildrenItemsControl = childrenItemsControl;
-      }
-
-      if( this.IsScrollingToTopAfterRefresh )
-      {
-        this.ScrollToTop();
-      }
-
-      // Since the template will bind on this property and this property
-      // will be different when the property parent is updated.
-      this.Notify( this.PropertyChanged, () => this.Properties );
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    private void UpdateThumb()
-    {
-      if( _dragThumb != null )
-      {
-      if( IsCategorized )
-        _dragThumb.Margin = new Thickness( 6, 0, 0, 0 );
-      else
-        _dragThumb.Margin = new Thickness( -1, 0, 0, 0 );
-      }
-    }
-
-    /// <summary>
-    /// Override this call to control the filter applied based on the
-    /// text input.
-    /// </summary>
-    /// <param name="filter"></param>
-    /// <returns></returns>
-    protected virtual Predicate<object> CreateFilter( string filter )
-    {
-      return null;
-    }
-
-    /// <summary>
-    /// Updates all property values in the PropertyGrid with the data from the SelectedObject
-    /// </summary>
-    public void Update()
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.UpdateValuesFromSource();
-      }
-    }
-
-
-
-
-    #endregion //Methods
-
-    #region Events
-
-    #region PropertyChanged Event
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    #endregion
-
-    #region PropertyValueChangedEvent Routed Event
-    public static readonly RoutedEvent PropertyValueChangedEvent = EventManager.RegisterRoutedEvent( "PropertyValueChanged", RoutingStrategy.Bubble, typeof( PropertyValueChangedEventHandler ), typeof( PropertyGrid ) );
-    public event PropertyValueChangedEventHandler PropertyValueChanged
-    {
-      add
-      {
-        AddHandler( PropertyValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PropertyValueChangedEvent, value );
-      }
-    }
-    #endregion
-
-    #region SelectedPropertyItemChangedEvent Routed Event
-
-    public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<PropertyItemBase> ), typeof( PropertyGrid ) );
-    public event RoutedPropertyChangedEventHandler<PropertyItemBase> SelectedPropertyItemChanged
-    {
-      add
-      {
-        AddHandler( SelectedPropertyItemChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( SelectedPropertyItemChangedEvent, value );
-      }
-    }
-    #endregion
-
-    #region SelectedObjectChangedEventRouted Routed Event
-
-    public static readonly RoutedEvent SelectedObjectChangedEvent = EventManager.RegisterRoutedEvent( "SelectedObjectChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( PropertyGrid ) );
-    public event RoutedPropertyChangedEventHandler<object> SelectedObjectChanged
-    {
-      add
-      {
-        AddHandler( SelectedObjectChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( SelectedObjectChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region IsPropertyBrowsable Event
-
-    public event IsPropertyBrowsableHandler IsPropertyBrowsable;
-
-    #endregion
-
-
-
-
-
-
-    #region PreparePropertyItemEvent Attached Routed Event
-
-    /// <summary>
-    /// Identifies the PreparePropertyItem event.
-    /// This attached routed event may be raised by the PropertyGrid itself or by a
-    /// PropertyItemBase containing sub-items.
-    /// </summary>
-    public static readonly RoutedEvent PreparePropertyItemEvent = EventManager.RegisterRoutedEvent( "PreparePropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyGrid ) );
-
-    /// <summary>
-    /// This event is raised when a property item is about to be displayed in the PropertyGrid.
-    /// This allow the user to customize the property item just before it is displayed.
-    /// </summary>
-    public event PropertyItemEventHandler PreparePropertyItem
-    {
-      add
-      {
-        AddHandler( PropertyGrid.PreparePropertyItemEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PropertyGrid.PreparePropertyItemEvent, value );
-      }
-    }
-
-    /// <summary>
-    /// Adds a handler for the PreparePropertyItem attached event
-    /// </summary>
-    /// <param name="element">the element to attach the handler</param>
-    /// <param name="handler">the handler for the event</param>
-    public static void AddPreparePropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
-    {
-      element.AddHandler( PropertyGrid.PreparePropertyItemEvent, handler );
-    }
-
-    /// <summary>
-    /// Removes a handler for the PreparePropertyItem attached event
-    /// </summary>
-    /// <param name="element">the element to attach the handler</param>
-    /// <param name="handler">the handler for the event</param>
-    public static void RemovePreparePropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
-    {
-      element.RemoveHandler( PropertyGrid.PreparePropertyItemEvent, handler );
-    }
-
-    internal static void RaisePreparePropertyItemEvent( UIElement source, PropertyItemBase propertyItem, object item )
-    {
-      source.RaiseEvent( new PropertyItemEventArgs( PropertyGrid.PreparePropertyItemEvent, source, propertyItem, item ) );
-    }
-
-    #endregion
-
-    #region ClearPropertyItemEvent Attached Routed Event
-
-    /// <summary>
-    /// Identifies the ClearPropertyItem event.
-    /// This attached routed event may be raised by the PropertyGrid itself or by a
-    /// PropertyItemBase containing sub items.
-    /// </summary>
-    public static readonly RoutedEvent ClearPropertyItemEvent = EventManager.RegisterRoutedEvent( "ClearPropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyGrid ) );
-    /// <summary>
-    /// This event is raised when an property item is about to be remove from the display in the PropertyGrid
-    /// This allow the user to remove any attached handler in the PreparePropertyItem event.
-    /// </summary>
-    public event PropertyItemEventHandler ClearPropertyItem
-    {
-      add
-      {
-        AddHandler( PropertyGrid.ClearPropertyItemEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PropertyGrid.ClearPropertyItemEvent, value );
-      }
-    }
-
-    /// <summary>
-    /// Adds a handler for the ClearPropertyItem attached event
-    /// </summary>
-    /// <param name="element">the element to attach the handler</param>
-    /// <param name="handler">the handler for the event</param>
-    public static void AddClearPropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
-    {
-      element.AddHandler( PropertyGrid.ClearPropertyItemEvent, handler );
-    }
-
-    /// <summary>
-    /// Removes a handler for the ClearPropertyItem attached event
-    /// </summary>
-    /// <param name="element">the element to attach the handler</param>
-    /// <param name="handler">the handler for the event</param>
-    public static void RemoveClearPropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
-    {
-      element.RemoveHandler( PropertyGrid.ClearPropertyItemEvent, handler );
-    }
-
-    internal static void RaiseClearPropertyItemEvent( UIElement source, PropertyItemBase propertyItem, object item )
-    {
-      source.RaiseEvent( new PropertyItemEventArgs( PropertyGrid.ClearPropertyItemEvent, source, propertyItem, item ) );
-    }
-
-    #endregion
-
-    #endregion //Events
-
-    #region Interfaces
-
-    #region ISupportInitialize Members
-
-    public override void BeginInit()
-    {
-      base.BeginInit();
-      _initializationCount++;
-    }
-
-    public override void EndInit()
-    {
-      base.EndInit();
-      if( --_initializationCount == 0 )
-      {
-        if( _hasPendingSelectedObjectChanged )
-        {
-          //This will update SelectedObject, Type, Name based on the actual config.
-          this.UpdateContainerHelper();
-          _hasPendingSelectedObjectChanged = false;
-        }
-        if( _containerHelper != null )
-        {
-          _containerHelper.OnEndInit();
-        }
-      }
-    }
-
-    #endregion
-
-    #region IPropertyContainer Members
-
-    FilterInfo IPropertyContainer.FilterInfo
-    {
-      get 
-      {
-        return new FilterInfo()
-        {
-          Predicate = this.CreateFilter(this.Filter),
-          InputString = this.Filter
-        };
-      }
-    }
-
-    ContainerHelperBase IPropertyContainer.ContainerHelper
-    {
-      get
-      {
-        return _containerHelper;
-      }
-    }
-
-    bool IPropertyContainer.IsSortedAlphabetically
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-
-    bool? IPropertyContainer.IsPropertyVisible( PropertyDescriptor pd )
-    {
-      var handler = this.IsPropertyBrowsable;
-      //If anyone is registered to PropertyGrid.IsPropertyBrowsable event
-      if( handler != null )
-      {
-        var isBrowsableArgs = new IsPropertyBrowsableArgs( pd );
-        handler( this, isBrowsableArgs );
-
-        return isBrowsableArgs.IsBrowsable;
-      }
-
-      return null;
-    }
-
-
-
-
-    #endregion
-
-
-    #endregion
-
-  }
-
-  #region PropertyValueChangedEvent Handler/Args
-  public delegate void PropertyValueChangedEventHandler( object sender, PropertyValueChangedEventArgs e );
-  public class PropertyValueChangedEventArgs : RoutedEventArgs
-  {
-    public object NewValue
-    {
-      get;
-      set;
-    }
-    public object OldValue
-    {
-      get;
-      set;
-    }
-
-    public PropertyValueChangedEventArgs( RoutedEvent routedEvent, object source, object oldValue, object newValue )
-      : base( routedEvent, source )
-    {
-      NewValue = newValue;
-      OldValue = oldValue;
-    }
-  }
-  #endregion
-
-  #region PropertyItemCreatedEvent Handler/Args
-  public delegate void PropertyItemEventHandler( object sender, PropertyItemEventArgs e );
-  public class PropertyItemEventArgs : RoutedEventArgs
-  {
-    public PropertyItemBase PropertyItem
-    {
-      get;
-      private set;
-    }
-
-    public object Item
-    {
-      get;
-      private set;
-    }
-
-    public PropertyItemEventArgs( RoutedEvent routedEvent, object source, PropertyItemBase propertyItem, object item )
-      : base( routedEvent, source )
-    {
-      this.PropertyItem = propertyItem;
-      this.Item = item;
-    }
-  }
-  #endregion
-
-  #region IsPropertyArgs class
-
-  public class PropertyArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public PropertyArgs( PropertyDescriptor pd )
-    {
-      this.PropertyDescriptor = pd;
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region PropertyDescriptor Property
-
-    public PropertyDescriptor PropertyDescriptor
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #endregion
-  }
-
-  #endregion
-
-  #region isPropertyBrowsableEvent Handler/Args
-
-  public delegate void IsPropertyBrowsableHandler( object sender, IsPropertyBrowsableArgs e );
-
-  public class IsPropertyBrowsableArgs : PropertyArgs
-  {
-    #region Constructors
-
-    public IsPropertyBrowsableArgs( PropertyDescriptor pd )
-      : base( pd )
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region IsBrowsable Property
-
-    public bool? IsBrowsable
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #endregion
-  }
-
-  #endregion
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
deleted file mode 100644
index ad8afead..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Linq.Expressions;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Controls;
-using System.Reflection;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.IO;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal class PropertyGridUtilities
-  {
-    internal static T GetAttribute<T>( PropertyDescriptor property ) where T : Attribute
-    {
-      return property.Attributes.OfType<T>().FirstOrDefault();
-    }
-
-
-
-
-    internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverter typeConverter, PropertyItem propertyItem )
-    {
-      ITypeEditor editor = null;
-
-      var context = new EditorTypeDescriptorContext( null, propertyItem.Instance, propertyItem.PropertyDescriptor );
-      if( (typeConverter != null)
-        && typeConverter.GetStandardValuesSupported( context )
-        && typeConverter.GetStandardValuesExclusive( context )
-        && (propertyType != typeof( bool )) && (propertyType != typeof( bool? )) )  //Bool type always have a BooleanConverter with standardValues : True/False.
-      {
-        var items = typeConverter.GetStandardValues( context );
-        editor = new SourceComboBoxEditor( items, typeConverter );
-      }
-      else if( propertyType == typeof( string )  )
-        editor = new TextBoxEditor();
-      else if( propertyType == typeof( bool ) || propertyType == typeof( bool? ) )
-        editor = new CheckBoxEditor();
-      else if( propertyType == typeof( decimal ) || propertyType == typeof( decimal? ) )
-        editor = new DecimalUpDownEditor();
-      else if( propertyType == typeof( double ) || propertyType == typeof( double? ) )
-        editor = new DoubleUpDownEditor();
-      else if( propertyType == typeof( int ) || propertyType == typeof( int? ) )
-        editor = new IntegerUpDownEditor();
-      else if( propertyType == typeof( short ) || propertyType == typeof( short? ) )
-        editor = new ShortUpDownEditor();
-      else if( propertyType == typeof( long ) || propertyType == typeof( long? ) )
-        editor = new LongUpDownEditor();
-      else if( propertyType == typeof( float ) || propertyType == typeof( float? ) )
-        editor = new SingleUpDownEditor();
-      else if( propertyType == typeof( byte ) || propertyType == typeof( byte? ) )
-        editor = new ByteUpDownEditor();
-      else if( propertyType == typeof( sbyte ) || propertyType == typeof( sbyte? ) )
-        editor = new SByteUpDownEditor();
-      else if( propertyType == typeof( uint ) || propertyType == typeof( uint? ) )
-        editor = new UIntegerUpDownEditor();
-      else if( propertyType == typeof( ulong ) || propertyType == typeof( ulong? ) )
-        editor = new ULongUpDownEditor();
-      else if( propertyType == typeof( ushort ) || propertyType == typeof( ushort? ) )
-        editor = new UShortUpDownEditor();
-      else if( propertyType == typeof( DateTime ) || propertyType == typeof( DateTime? ) )
-        editor = new DateTimeUpDownEditor();
-      else if( ( propertyType == typeof( Color ) ) || ( propertyType == typeof( Color? ) ) )
-        editor = new ColorEditor();
-      else if( propertyType.IsEnum )
-        editor = new EnumComboBoxEditor();
-      else if( propertyType == typeof( TimeSpan ) || propertyType == typeof( TimeSpan? ) )
-        editor = new TimeSpanUpDownEditor();
-      else if( propertyType == typeof( FontFamily ) || propertyType == typeof( FontWeight ) || propertyType == typeof( FontStyle ) || propertyType == typeof( FontStretch ) )
-        editor = new FontComboBoxEditor();
-      else if (propertyType == typeof(Guid) || propertyType == typeof(Guid?))
-        editor = new MaskedTextBoxEditor() { ValueDataType = propertyType, Mask = "AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA" };
-      else if (propertyType == typeof(char) || propertyType == typeof(char?))
-        editor = new MaskedTextBoxEditor() { ValueDataType = propertyType, Mask = "&" };
-      else if( propertyType == typeof( object ) )
-        // If any type of object is possible in the property, default to the TextBoxEditor.
-        // Useful in some case (e.g., Button.Content).
-        // Can be reconsidered but was the legacy behavior on the PropertyGrid.
-        editor = new TextBoxEditor();
-      else
-      {
-        var listType = ListUtilities.GetListItemType( propertyType );
-
-        // A List of T
-        if( listType != null )
-        {
-          if( !listType.IsPrimitive && !listType.Equals( typeof( String ) ) && !listType.IsEnum )
-            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor();
-          else
-            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.PrimitiveTypeCollectionEditor();
-        }
-        else
-        {
-          var dictionaryType = ListUtilities.GetDictionaryItemsType( propertyType );
-          var collectionType = ListUtilities.GetCollectionItemType( propertyType );
-          // A dictionary of T or a Collection of T or an ICollection
-          if( (dictionaryType != null) || (collectionType != null) || typeof( ICollection ).IsAssignableFrom( propertyType ) )
-          {
-            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor();
-          }
-          else
-          {
-            // If the type is not supported, check if there is a converter that supports
-            // string conversion to the object type. Use TextBox in theses cases.
-            // Otherwise, return a TextBlock editor since no valid editor exists.
-            editor = (typeConverter != null && typeConverter.CanConvertFrom( typeof( string ) ))
-              ? (ITypeEditor)new TextBoxEditor()
-              : (ITypeEditor)new TextBlockEditor();
-          }
-        }
-      }
-
-      return editor;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    #region Private class
-
-    private class EditorTypeDescriptorContext : ITypeDescriptorContext
-    {
-      IContainer _container;
-      object _instance;
-      PropertyDescriptor _propertyDescriptor;
-
-      internal EditorTypeDescriptorContext( IContainer container, object instance, PropertyDescriptor pd )
-      {
-        _container = container;
-        _instance = instance;
-        _propertyDescriptor = pd;
-      }
-
-      IContainer ITypeDescriptorContext.Container
-      {
-        get
-        {
-          return _container;
-        }
-      }
-      object ITypeDescriptorContext.Instance
-      {
-        get
-        {
-          return _instance;
-        }
-      }
-      PropertyDescriptor ITypeDescriptorContext.PropertyDescriptor
-      {
-        get
-        {
-          return _propertyDescriptor;
-        }
-      }
-
-      void ITypeDescriptorContext.OnComponentChanged()
-      {
-      }
-
-      bool ITypeDescriptorContext.OnComponentChanging()
-      {
-        return false;
-      }
-
-      object IServiceProvider.GetService( Type serviceType )
-      {
-        return null;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
deleted file mode 100644
index e2b90cb2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Data;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq.Expressions;
-using System.Diagnostics;
-using System.Globalization;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  [TemplatePart( Name = "content", Type = typeof( ContentControl ) )]
-  public class PropertyItem : CustomPropertyItem
-  {
-    #region Properties
-
-    #region IsReadOnly
-
-    /// <summary>
-    /// Identifies the IsReadOnly dependency property
-    /// </summary>
-    public static readonly DependencyProperty IsReadOnlyProperty =
-        DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false ) );
-
-    public bool IsReadOnly
-    {
-      get { return ( bool )GetValue( IsReadOnlyProperty ); }
-      set { SetValue( IsReadOnlyProperty, value ); }
-    }
-
-    #endregion //IsReadOnly
-
-    #region IsInValid
-
-    /// <summary>
-    /// Identifies the IsInvalid dependency property
-    /// </summary>
-    public static readonly DependencyProperty IsInvalidProperty =
-        DependencyProperty.Register( "IsInvalid", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsInvalidChanged ) );
-
-    public bool IsInvalid
-    {
-      get
-      {
-        return ( bool )GetValue( IsInvalidProperty );
-      }
-      internal set
-      {
-        SetValue( IsInvalidProperty, value );
-      }
-    }
-
-    private static void OnIsInvalidChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-        propertyItem.OnIsInvalidChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsInvalidChanged( bool oldValue, bool newValue )
-    {
-      var be = this.GetBindingExpression( PropertyItem.ValueProperty );
-
-      if( newValue )
-      {
-        var validationError = new ValidationError( new InvalidValueValidationRule(), be );
-        validationError.ErrorContent = "Value could not be converted.";
-        Validation.MarkInvalid( be, validationError );
-      }
-      else
-      {
-        Validation.ClearInvalid( be );
-      }
-    }
-
-
-    #endregion // IsInvalid
-
-    #region PropertyDescriptor
-
-    public PropertyDescriptor PropertyDescriptor
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //PropertyDescriptor
-
-    #region PropertyName
-
-    public string PropertyName
-    {
-      get
-      {
-        return (this.DescriptorDefinition != null) ? this.DescriptorDefinition.PropertyName : null;
-      }
-    }
-
-    #endregion
-
-    #region PropertyType
-
-    public Type PropertyType
-    {
-      get
-      {
-        return ( PropertyDescriptor != null )
-          ? PropertyDescriptor.PropertyType
-          : null;
-      }
-    }
-
-    #endregion //PropertyType
-
-    #region DescriptorDefinition
-
-    internal DescriptorPropertyDefinitionBase DescriptorDefinition
-    {
-      get;
-      private set;
-    }
-
-    #endregion DescriptorDefinition    
-
-    #region Instance
-
-    public object Instance
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //Instance
-
-    #endregion //Properties
-
-    #region Overrides
-
-    protected override string GetPropertyItemName()
-    {
-      return this.PropertyName;
-    }
-
-    protected override Type GetPropertyItemType()
-    {
-      return this.PropertyType;
-    }
-
-    protected override void OnIsExpandedChanged( bool oldValue, bool newValue )
-    {
-      if( newValue && this.IsLoaded )
-      {
-        this.GenerateExpandedPropertyItems();
-      }
-    }
-
-    protected override object OnCoerceValueChanged( object baseValue )
-    {
-      // Propagate error from DescriptorPropertyDefinitionBase to PropertyItem.Value
-      // to see the red error rectangle in the propertyGrid.
-      BindingExpression be = this.GetBindingExpression( PropertyItem.ValueProperty );
-      this.SetRedInvalidBorder( be );
-      return baseValue;
-    }
-
-    protected override void OnValueChanged( object oldValue, object newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-
-      // A Default Value is defined and newValue is null => set the Default Value
-      if( ( newValue == null ) && ( this.DescriptorDefinition != null ) && ( this.DescriptorDefinition.DefaultValue != null ) )
-      {
-#if VS2008
-        this.Value = this.DescriptorDefinition.DefaultValue;
-#else
-        this.SetCurrentValue( PropertyItem.ValueProperty, this.DescriptorDefinition.DefaultValue );
-#endif
-      }
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal void SetRedInvalidBorder( BindingExpression be )
-    {
-      if( (be != null) && be.DataItem is DescriptorPropertyDefinitionBase )
-      {
-        DescriptorPropertyDefinitionBase descriptor = be.DataItem as DescriptorPropertyDefinitionBase;
-        if( Validation.GetHasError( descriptor ) )
-        {
-          ReadOnlyObservableCollection<ValidationError> errors = Validation.GetErrors( descriptor );
-          Validation.MarkInvalid( be, errors[ 0 ] );
-        }
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void OnDefinitionContainerHelperInvalidated( object sender, EventArgs e )
-    {
-      if( this.ContainerHelper != null )
-      {
-        this.ContainerHelper.ClearHelper();
-      }
-      var helper = this.DescriptorDefinition.CreateContainerHelper( this );
-      this.ContainerHelper = helper;
-      if( this.IsExpanded )
-      {
-        helper.GenerateProperties();
-      }
-    }
-
-    private void Init( DescriptorPropertyDefinitionBase definition )
-    {
-      if( definition == null )
-        throw new ArgumentNullException( "definition" );
-
-      if( this.ContainerHelper != null )
-      {
-        this.ContainerHelper.ClearHelper();
-      }
-      this.DescriptorDefinition = definition;
-      this.ContainerHelper = definition.CreateContainerHelper( this );
-      definition.ContainerHelperInvalidated += new EventHandler( OnDefinitionContainerHelperInvalidated );
-      this.Loaded += this.PropertyItem_Loaded;
-    }
-
-    private void GenerateExpandedPropertyItems()
-    {
-      if( this.IsExpanded )
-      {
-        // This withholds the generation of all PropertyItem instances (recursively)
-        // until the PropertyItem is expanded.
-        var objectContainerHelper = ContainerHelper as ObjectContainerHelperBase;
-        if( objectContainerHelper != null )
-        {
-          objectContainerHelper.GenerateProperties();
-        }
-      }
-    }
-
-    #endregion
-
-    #region Event Handlers
-
-    private void PropertyItem_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.GenerateExpandedPropertyItems();
-    }
-
-    #endregion
-
-    #region Constructors
-
-    internal PropertyItem( DescriptorPropertyDefinitionBase definition )
-      : base( definition.IsPropertyGridCategorized, !definition.PropertyType.IsArray )
-    {
-      this.Init( definition );
-    }
-
-    #endregion //Constructors
-
-    private class InvalidValueValidationRule : ValidationRule
-    {
-      public override ValidationResult Validate( object value, CultureInfo cultureInfo )
-      {
-        // Will always return an error.
-        return new ValidationResult( false, null );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
deleted file mode 100644
index 5d80bac9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
+++ /dev/null
@@ -1,602 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Data;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  [TemplatePart( Name = PropertyGrid.PART_PropertyItemsControl, Type = typeof( PropertyItemsControl ) )]
-  [TemplatePart( Name = PropertyItemBase.PART_ValueContainer, Type = typeof( ContentControl ) )]
-  public abstract class PropertyItemBase : Control, IPropertyContainer, INotifyPropertyChanged
-  {
-    internal const string PART_ValueContainer = "PART_ValueContainer";
-
-    private ContentControl _valueContainer;
-    private ContainerHelperBase _containerHelper;
-    private IPropertyContainer _parentNode;
-    internal bool _isPropertyGridCategorized;
-    internal bool _isSortedAlphabetically = true;
-
-    #region Properties
-
-    #region AdvancedOptionsIcon
-
-    public static readonly DependencyProperty AdvancedOptionsIconProperty =
-        DependencyProperty.Register( "AdvancedOptionsIcon", typeof( ImageSource ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
-
-    public ImageSource AdvancedOptionsIcon
-    {
-      get { return ( ImageSource )GetValue( AdvancedOptionsIconProperty ); }
-      set { SetValue( AdvancedOptionsIconProperty, value ); }
-    }
-
-    #endregion //AdvancedOptionsIcon
-
-    #region AdvancedOptionsTooltip
-
-    public static readonly DependencyProperty AdvancedOptionsTooltipProperty =
-        DependencyProperty.Register( "AdvancedOptionsTooltip", typeof( object ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
-
-    public object AdvancedOptionsTooltip
-    {
-      get { return ( object )GetValue( AdvancedOptionsTooltipProperty ); }
-      set { SetValue( AdvancedOptionsTooltipProperty, value ); }
-    }
-
-    #endregion //AdvancedOptionsTooltip
-
-
-
-
-
-
-    #region Description
-
-    public static readonly DependencyProperty DescriptionProperty =
-        DependencyProperty.Register( "Description", typeof( string ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
-
-    public string Description
-    {
-      get { return ( string )GetValue( DescriptionProperty ); }
-      set { SetValue( DescriptionProperty, value ); }
-    }
-
-    #endregion //Description
-
-    #region DisplayName
-
-    public static readonly DependencyProperty DisplayNameProperty =
-        DependencyProperty.Register( "DisplayName", typeof( string ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
-
-    public string DisplayName
-    {
-      get { return ( string )GetValue( DisplayNameProperty ); }
-      set { SetValue( DisplayNameProperty, value ); }
-    }
-
-    #endregion //DisplayName
-
-    #region Editor
-
-    public static readonly DependencyProperty EditorProperty = DependencyProperty.Register( "Editor", typeof( FrameworkElement ), typeof( PropertyItemBase ), new UIPropertyMetadata( null, OnEditorChanged ) );
-    public FrameworkElement Editor
-    {
-      get
-      {
-        return ( FrameworkElement )GetValue( EditorProperty );
-      }
-      set
-      {
-        SetValue( EditorProperty, value );
-      }
-    }
-
-    private static void OnEditorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyItemBase propertyItem = o as PropertyItemBase;
-      if( propertyItem != null )
-        propertyItem.OnEditorChanged( ( FrameworkElement )e.OldValue, ( FrameworkElement )e.NewValue );
-    }
-
-    protected virtual void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
-    {
-    }
-
-    #endregion //Editor
-
-    #region HighlightedText
-
-    public static readonly DependencyProperty HighlightedTextProperty = DependencyProperty.Register( "HighlightedText", typeof( string ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
-
-    public string HighlightedText
-    {
-      get
-      {
-        return ( string )GetValue( HighlightedTextProperty );
-      }
-      set
-      {
-        SetValue( HighlightedTextProperty, value );
-      }
-    }
-
-    #endregion //HighlightedText
-
-    #region IsExpanded
-
-    public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register( "IsExpanded", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false, OnIsExpandedChanged ) );
-    public bool IsExpanded
-    {
-      get
-      {
-        return ( bool )GetValue( IsExpandedProperty );
-      }
-      set
-      {
-        SetValue( IsExpandedProperty, value );
-      }
-    }
-
-    private static void OnIsExpandedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyItemBase propertyItem = o as PropertyItemBase;
-      if( propertyItem != null )
-        propertyItem.OnIsExpandedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsExpandedChanged( bool oldValue, bool newValue )
-    {
-    }
-
-    #endregion IsExpanded
-
-    #region IsExpandable
-
-    public static readonly DependencyProperty IsExpandableProperty =
-        DependencyProperty.Register( "IsExpandable", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false ) );
-
-    public bool IsExpandable
-    {
-      get { return ( bool )GetValue( IsExpandableProperty ); }
-      set { SetValue( IsExpandableProperty, value ); }
-    }
-
-    #endregion //IsExpandable
-
-    #region IsSelected
-
-    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
-    public bool IsSelected
-    {
-      get
-      {
-        return ( bool )GetValue( IsSelectedProperty );
-      }
-      set
-      {
-        SetValue( IsSelectedProperty, value );
-      }
-    }
-
-    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyItemBase propertyItem = o as PropertyItemBase;
-      if( propertyItem != null )
-        propertyItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
-    {
-      this.RaiseItemSelectionChangedEvent();
-    }
-
-    #endregion //IsSelected
-
-    #region ParentElement
-    /// <summary>
-    /// Gets the parent property grid element of this property.
-    /// A PropertyItemBase instance if this is a sub-element, 
-    /// or the PropertyGrid itself if this is a first-level property.
-    /// </summary>
-    public FrameworkElement ParentElement
-    {
-      get { return this.ParentNode as FrameworkElement; }
-    }
-    #endregion
-
-    #region ParentNode
-
-    internal IPropertyContainer ParentNode
-    {
-      get
-      {
-        return _parentNode;
-      }
-      set
-      {
-        _parentNode = value;
-      }
-    }
-    #endregion
-
-    #region ValueContainer
-
-    internal ContentControl ValueContainer
-    {
-      get
-      {
-        return _valueContainer;
-      }
-    }
-
-    #endregion
-
-    #region Level
-
-    public int Level
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //Level
-
-    #region Properties
-
-    public IList Properties
-    {
-      get
-      {
-        if( _containerHelper == null )
-        {
-          _containerHelper = new ObjectContainerHelper( this, null );
-        }
-        return _containerHelper.Properties;
-      }
-    }
-
-    #endregion //Properties
-
-    #region PropertyContainerStyle
-    /// <summary>
-    /// Get the PropertyContainerStyle for sub items of this property.
-    /// It return the value defined on PropertyGrid.PropertyContainerStyle.
-    /// </summary>
-    public Style PropertyContainerStyle 
-    {
-      get
-      {
-        return ( ParentNode != null )
-        ? ParentNode.PropertyContainerStyle
-        : null;
-      }
-    }
-    #endregion
-
-    #region ContainerHelper
-
-    internal ContainerHelperBase ContainerHelper
-    {
-      get
-      {
-        return _containerHelper;
-      }
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "value" );
-
-        _containerHelper = value;
-        // Properties property relies on the "Properties" property of the helper
-        // class. Raise a property-changed event.
-        this.RaisePropertyChanged( () => this.Properties );
-      }
-    }
-
-    #endregion
-
-    #region WillRefreshPropertyGrid
-
-    public static readonly DependencyProperty WillRefreshPropertyGridProperty =
-        DependencyProperty.Register( "WillRefreshPropertyGrid", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false ) );
-
-    public bool WillRefreshPropertyGrid
-    {
-      get
-      {
-        return ( bool )GetValue( WillRefreshPropertyGridProperty );
-      }
-      set
-      {
-        SetValue( WillRefreshPropertyGridProperty, value );
-      }
-    }
-
-    #endregion //WillRefreshPropertyGrid
-
-    #endregion //Properties
-
-    #region Events
-
-    #region ItemSelectionChanged
-
-    internal static readonly RoutedEvent ItemSelectionChangedEvent = EventManager.RegisterRoutedEvent(
-        "ItemSelectionChangedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( PropertyItemBase ) );
-
-    private void RaiseItemSelectionChangedEvent()
-    {
-      RaiseEvent( new RoutedEventArgs( PropertyItemBase.ItemSelectionChangedEvent ) );
-    }
-
-    #endregion
-
-    #region PropertyChanged event
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    internal void RaisePropertyChanged<TMember>( Expression<Func<TMember>> propertyExpression )
-    {
-      this.Notify( this.PropertyChanged, propertyExpression );
-    }
-    internal void RaisePropertyChanged( string name )
-    {
-      this.Notify( this.PropertyChanged, name );
-    }
-    #endregion
-
-    #endregion //Events
-
-    #region Constructors
-
-    static PropertyItemBase()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyItemBase ), new FrameworkPropertyMetadata( typeof( PropertyItemBase ) ) );
-    }
-
-    internal PropertyItemBase()
-    {
-      this.GotFocus += new RoutedEventHandler( PropertyItemBase_GotFocus );
-      this.RequestBringIntoView += this.PropertyItemBase_RequestBringIntoView;
-      AddHandler( PropertyItemsControl.PreparePropertyItemEvent, new PropertyItemEventHandler( OnPreparePropertyItemInternal ) );
-      AddHandler( PropertyItemsControl.ClearPropertyItemEvent, new PropertyItemEventHandler( OnClearPropertyItemInternal ) );
-    }
-
-    #endregion //Constructors
-
-    #region Event Handlers
-
-    private void OnPreparePropertyItemInternal( object sender, PropertyItemEventArgs args )
-    {
-      // This is the callback of the PreparePropertyItem comming from the template PropertyItemControl.
-      args.PropertyItem.Level = this.Level + 1;
-      _containerHelper.PrepareChildrenPropertyItem( args.PropertyItem, args.Item );
-
-      args.Handled = true;
-    }
-
-    private void OnClearPropertyItemInternal( object sender, PropertyItemEventArgs args )
-    {
-      _containerHelper.ClearChildrenPropertyItem( args.PropertyItem, args.Item );
-      // This is the callback of the PreparePropertyItem comming from the template PropertyItemControl.
-      args.PropertyItem.Level = 0;
-
-      args.Handled = true;
-    }
-
-    private void PropertyItemBase_RequestBringIntoView( object sender, RequestBringIntoViewEventArgs e )
-    {
-      e.Handled = true;
-    }
-
-    #endregion  //Event Handlers
-
-    #region Methods
-
-    protected virtual Type GetPropertyItemType()
-    {
-      return null;
-    }
-
-    protected virtual string GetPropertyItemName()
-    {
-      return this.DisplayName;
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-      _containerHelper.ChildrenItemsControl = GetTemplateChild( PropertyGrid.PART_PropertyItemsControl ) as PropertyItemsControl;
-      _valueContainer = GetTemplateChild( PropertyItemBase.PART_ValueContainer ) as ContentControl;
-    }
-
-    protected override void OnMouseDown( MouseButtonEventArgs e )
-    {
-      IsSelected = true;
-      if( !this.IsKeyboardFocusWithin )
-      {
-        this.Focus();
-      }
-      // Handle the event; otherwise, the possible 
-      // parent property item will select itself too.
-      e.Handled = true;
-    }
-
-
-    private void PropertyItemBase_GotFocus( object sender, RoutedEventArgs e )
-    { 
-      IsSelected = true;
-      // Handle the event; otherwise, the possible 
-      // parent property item will select itself too.
-      e.Handled = true;
-    }
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      // First check that the raised property is actually a real CLR property.
-      // This could be something else like an Attached DP.
-      if( ReflectionHelper.IsPublicInstanceProperty( GetType(), e.Property.Name ) 
-        && this.IsLoaded 
-        && (_parentNode != null) 
-        && !_parentNode.ContainerHelper.IsCleaning)
-      {
-        this.RaisePropertyChanged( e.Property.Name );
-      }
-    }
-
-    private PropertyDefinitionCollection GetPropertItemPropertyDefinitions()
-    {
-      if( (this.ParentNode != null) && (this.ParentNode.PropertyDefinitions != null) )
-      {
-        var name = this.GetPropertyItemName();
-        foreach( var pd in this.ParentNode.PropertyDefinitions )
-        {
-          if( pd.TargetProperties.Contains( name ) )
-          {
-            // PropertyDefinitions contains a PropertyDefinition for this PropertyItem Name => return its PropertyDefinitions.
-            return pd.PropertyDefinitions;
-          }
-          else
-          {
-            var type = this.GetPropertyItemType();
-            if( type != null )
-            {
-              foreach( var targetProperty in pd.TargetProperties )
-              {
-                var targetPropertyType = targetProperty as Type;
-                // PropertyDefinitions contains a PropertyDefinition for this PropertyItem Type => return its PropertyDefinitions.
-                if( (targetPropertyType != null) && targetPropertyType.IsAssignableFrom( type ) )
-                  return pd.PropertyDefinitions;
-              }
-            }
-          }
-        }
-      }
-      return null;
-    }
-
-    #endregion //Methods
-
-    #region IPropertyContainer Members
-
-
-
-
-
-
-    Style IPropertyContainer.PropertyContainerStyle
-    {
-      get { return this.PropertyContainerStyle; }
-    }
-
-    EditorDefinitionCollection IPropertyContainer.EditorDefinitions
-    {
-      get
-      {
-        return (this.ParentNode != null) ? this.ParentNode.EditorDefinitions : null;
-      }
-    }
-
-    PropertyDefinitionCollection IPropertyContainer.PropertyDefinitions
-    {
-      get
-      {
-        return this.GetPropertItemPropertyDefinitions();
-      }
-    }
-
-    ContainerHelperBase IPropertyContainer.ContainerHelper 
-    {
-      get
-      {
-        return this.ContainerHelper;
-      }
-    }
-
-    bool IPropertyContainer.IsCategorized 
-    {
-      get
-      {
-        return _isPropertyGridCategorized;
-      }
-    }
-
-    bool IPropertyContainer.IsSortedAlphabetically
-    {
-      get
-      {
-        return _isSortedAlphabetically;
-      }
-    }
-
-    bool IPropertyContainer.AutoGenerateProperties
-    {
-      get
-      {
-        if( this.ParentNode != null )
-        {
-          var propertyItemPropertyDefinitions = this.GetPropertItemPropertyDefinitions();
-          // No PropertyDefinitions specified : show all properties of this PropertyItem.
-          if( (propertyItemPropertyDefinitions == null) || (propertyItemPropertyDefinitions.Count == 0) )
-            return true;
-
-          // A PropertyDefinitions is specified : show only the properties of the PropertyDefinitions from this PropertyItem.
-          return this.ParentNode.AutoGenerateProperties;
-        }
-        return true;
-      }
-    }
-
-    bool IPropertyContainer.HideInheritedProperties
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    FilterInfo IPropertyContainer.FilterInfo
-    {
-      get { return new FilterInfo(); }
-    }
-
-    bool? IPropertyContainer.IsPropertyVisible( PropertyDescriptor pd )
-    {
-      if( _parentNode != null )
-      {
-        return _parentNode.IsPropertyVisible( pd );
-      }
-
-      return null;
-    }
-
-
-
-#endregion
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
deleted file mode 100644
index 5f54fd2b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Windows.Data;
-using System;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using System.Linq;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Reflection;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class PropertyItemCollection : ReadOnlyObservableCollection<PropertyItem>
-  {
-    internal static readonly string CategoryPropertyName;
-    internal static readonly string CategoryOrderPropertyName;
-    internal static readonly string PropertyOrderPropertyName;
-    internal static readonly string DisplayNamePropertyName;
-
-    private bool _preventNotification;
-
-    static PropertyItemCollection()
-    {
-      PropertyItem p = null;
-      CategoryPropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.Category );
-      CategoryOrderPropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.CategoryOrder );
-      PropertyOrderPropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.PropertyOrder );
-      DisplayNamePropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.DisplayName );
-    }
-
-    public PropertyItemCollection(ObservableCollection<PropertyItem> editableCollection)
-      :base(editableCollection)
-    {
-      EditableCollection = editableCollection;
-    }
-
-    internal Predicate<object> FilterPredicate
-    {
-      get { return GetDefaultView().Filter; }
-      set { GetDefaultView().Filter = value; }
-    }
-
-    public ObservableCollection<PropertyItem> EditableCollection { get; private set; }
-
-    private ICollectionView GetDefaultView()
-    {
-      return CollectionViewSource.GetDefaultView( this );
-    }
-
-    public void GroupBy( string name )
-    {
-      GetDefaultView().GroupDescriptions.Add( new PropertyGroupDescription( name ) );
-    }
-
-    public void SortBy( string name, ListSortDirection sortDirection )
-    {
-      GetDefaultView().SortDescriptions.Add( new SortDescription( name, sortDirection ) );
-    }
-
-    public void Filter( string text )
-    {
-      Predicate<object> filter = PropertyItemCollection.CreateFilter( text, this.Items, null );
-      GetDefaultView().Filter = filter;
-    }
-
-    protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs args )
-    {
-      if( _preventNotification )
-        return;
-
-      base.OnCollectionChanged( args );
-    }
-
-    internal void UpdateItems( IEnumerable<PropertyItem> newItems )
-    {
-      if( newItems == null )
-        throw new ArgumentNullException( "newItems" );
-
-      _preventNotification = true;
-      using( GetDefaultView().DeferRefresh() )
-      {
-        EditableCollection.Clear();
-        foreach( var item in newItems )
-        {
-          this.EditableCollection.Add( item );
-        }
-      }
-      _preventNotification = false;
-      OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-    }
-
-    internal void UpdateCategorization( GroupDescription groupDescription, bool isPropertyGridCategorized, bool sortAlphabetically )
-    {
-      // Compute Display Order relative to PropertyOrderAttributes on PropertyItem
-      // which could be different in Alphabetical or Categorized mode.
-      foreach( PropertyItem item in this.Items )
-      {
-        item.DescriptorDefinition.DisplayOrder = item.DescriptorDefinition.ComputeDisplayOrderInternal( isPropertyGridCategorized );
-        item.PropertyOrder = item.DescriptorDefinition.DisplayOrder;
-      }
-
-      // Clear view values
-      ICollectionView view = this.GetDefaultView();
-      using( view.DeferRefresh() )
-      {
-        view.GroupDescriptions.Clear();
-        view.SortDescriptions.Clear();
-
-        // Update view values
-        if( groupDescription != null )
-        {
-          view.GroupDescriptions.Add( groupDescription );
-          if( sortAlphabetically )
-          {
-            SortBy( CategoryOrderPropertyName, ListSortDirection.Ascending );
-            SortBy( CategoryPropertyName, ListSortDirection.Ascending );
-          }
-        }
-
-        if( sortAlphabetically )
-        {
-          SortBy( PropertyOrderPropertyName, ListSortDirection.Ascending );
-          SortBy( DisplayNamePropertyName, ListSortDirection.Ascending );
-        }
-      }
-    }
-
-    internal void RefreshView()
-    {
-      GetDefaultView().Refresh();
-    }
-
-    internal static Predicate<object> CreateFilter( string text, IList<PropertyItem> PropertyItems, IPropertyContainer propertyContainer )
-    {
-      Predicate<object> filter = null;
-
-      if( !string.IsNullOrEmpty( text ) )
-      {
-        filter = ( item ) =>
-        {
-          var property = item as PropertyItem;
-          if( property.DisplayName != null )
-          {
-#if !VS2008
-            var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( property.PropertyDescriptor );
-            if( displayAttribute != null )
-            {
-              var canBeFiltered = displayAttribute.GetAutoGenerateFilter();
-              if( canBeFiltered.HasValue && !canBeFiltered.Value )
-                return false;
-            }
-#endif
-            property.HighlightedText = property.DisplayName.ToLower().Contains( text.ToLower() ) ? text : null;
-            return (property.HighlightedText != null);
-          }
-
-          return false;
-        };
-      }
-
-      return filter;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
deleted file mode 100644
index 2839de49..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows.Controls;
-using System.Windows;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  /// <summary>
-  /// This Control is intended to be used in the template of the 
-  /// PropertyItemBase and PropertyGrid classes to contain the
-  /// sub-children properties.
-  /// </summary>
-  public class PropertyItemsControl : ItemsControl
-  {
-    public PropertyItemsControl()
-    {
-      var propertyItemsControlProperties = TypeDescriptor.GetProperties( this, new Attribute[] { new PropertyFilterAttribute( PropertyFilterOptions.All ) } );
-      var prop1 = propertyItemsControlProperties.Find( "VirtualizingPanel.IsVirtualizingWhenGrouping", false );
-      if( prop1 != null )
-      {
-        prop1.SetValue( this, true );
-      }
-      var prop2 = propertyItemsControlProperties.Find( "VirtualizingPanel.CacheLengthUnit", false );
-      if( prop2 != null )
-      {
-        prop2.SetValue( this, Enum.ToObject( prop2.PropertyType, 1 ) );
-      }
-    }
-
-    #region PreparePropertyItemEvent Attached Routed Event
-
-    internal static readonly RoutedEvent PreparePropertyItemEvent = EventManager.RegisterRoutedEvent( "PreparePropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyItemsControl ) );
-    internal event PropertyItemEventHandler PreparePropertyItem
-    {
-      add
-      {
-        AddHandler( PropertyItemsControl.PreparePropertyItemEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PropertyItemsControl.PreparePropertyItemEvent, value );
-      }
-    }
-
-    private void RaisePreparePropertyItemEvent( PropertyItemBase propertyItem, object item )
-    {
-      this.RaiseEvent( new PropertyItemEventArgs( PropertyItemsControl.PreparePropertyItemEvent, this, propertyItem, item ) );
-    }
-
-    #endregion
-
-    #region ClearPropertyItemEvent Attached Routed Event
-
-    internal static readonly RoutedEvent ClearPropertyItemEvent = EventManager.RegisterRoutedEvent( "ClearPropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyItemsControl ) );
-    internal event PropertyItemEventHandler ClearPropertyItem
-    {
-      add
-      {
-        AddHandler( PropertyItemsControl.ClearPropertyItemEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PropertyItemsControl.ClearPropertyItemEvent, value );
-      }
-    }
-
-    private void RaiseClearPropertyItemEvent( PropertyItemBase propertyItem, object item )
-    {
-      this.RaiseEvent( new PropertyItemEventArgs( PropertyItemsControl.ClearPropertyItemEvent, this, propertyItem, item ) );
-    }
-
-    #endregion
-
-    protected override bool IsItemItsOwnContainerOverride( object item )
-    {
-      return ( item is PropertyItemBase );
-    }
-
-
-    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
-    {
-      base.PrepareContainerForItemOverride( element, item );
-      this.RaisePreparePropertyItemEvent( ( PropertyItemBase )element, item );
-    }
-
-    protected override void ClearContainerForItemOverride( DependencyObject element, object item )
-    {
-      this.RaiseClearPropertyItemEvent( ( PropertyItemBase )element, item );
-      base.ClearContainerForItemOverride( element, item );
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs
deleted file mode 100644
index dd3ce60c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public static class StringConstants
-  {
-    public static string Local
-    {
-      get { return "Local"; }
-    }
-
-    public static string Resource
-    {
-      get { return "Resource"; }
-    }
-
-    public static string Databinding
-    {
-      get { return "Databinding"; }
-    }
-
-    public static string Inheritance
-    {
-      get { return "Inheritance"; }
-    }
-
-    public static string StyleSetter
-    {
-      get { return "Style Setter"; }
-    }
-
-    public static string Default
-    {
-      get { return "Default"; }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
deleted file mode 100644
index d1445c04..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  /// <summary>
-  /// This class is intended to provide the "Type" target
-  /// for property definitions or editor definitions when
-  /// using Property Element Syntax.
-  /// </summary>
-  public sealed class TargetPropertyType
-  {
-    private Type _type;
-    private bool _sealed;
-
-    public Type Type
-    {
-      get { return _type; }
-      set 
-      {
-        if( _sealed )
-          throw new InvalidOperationException(
-            string.Format(
-            "{0}.Type property cannot be modified once the instance is used",
-            typeof( TargetPropertyType ) ) );
-
-        _type = value; 
-      }
-    }
-
-    internal void Seal()
-    {
-      if( _type == null )
-        throw new InvalidOperationException(
-          string.Format( "{0}.Type property must be initialized", typeof( TargetPropertyType ) ) );
-
-      _sealed = true;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
deleted file mode 100644
index d0fbbd9b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class TrimmedTextBlock : TextBlock
-  {
-    #region Constructor
-
-    public TrimmedTextBlock()
-    {
-      this.SizeChanged += this.TrimmedTextBlock_SizeChanged;
-    }
-
-    #endregion
-
-    #region IsTextTrimmed Property
-
-    public static readonly DependencyProperty IsTextTrimmedProperty = DependencyProperty.Register( "IsTextTrimmed", typeof( bool ), typeof( TrimmedTextBlock ), new PropertyMetadata( false, OnIsTextTrimmedChanged ) );
-    public bool IsTextTrimmed
-    {
-      get
-      {
-        return ( bool )GetValue( IsTextTrimmedProperty );
-      }
-      private set
-      {
-        SetValue( IsTextTrimmedProperty, value );
-      }
-    }
-
-    private static void OnIsTextTrimmedChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      var textBlock = d as TrimmedTextBlock;
-      if( textBlock != null )
-      {
-        textBlock.OnIsTextTrimmedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-      }
-    }
-
-    private void OnIsTextTrimmedChanged( bool oldValue, bool newValue )
-    {
-        this.ToolTip = ( newValue ) ? this.Text : null;
-    }
-
-    #endregion
-
-    #region HighlightedBrush
-
-    public static readonly DependencyProperty HighlightedBrushProperty = DependencyProperty.Register( "HighlightedBrush", typeof( Brush ), typeof( TrimmedTextBlock ), new FrameworkPropertyMetadata( Brushes.Yellow ) );
-
-    public Brush HighlightedBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( HighlightedBrushProperty );
-      }
-      set
-      {
-        SetValue( HighlightedBrushProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region HighlightedText
-
-    public static readonly DependencyProperty HighlightedTextProperty = DependencyProperty.Register( "HighlightedText", typeof( string ), typeof( TrimmedTextBlock ), new FrameworkPropertyMetadata( null, HighlightedTextChanged ) );
-
-    public string HighlightedText
-    {
-      get
-      {
-        return ( string )GetValue( HighlightedTextProperty );
-      }
-      set
-      {
-        SetValue( HighlightedTextProperty, value );
-      }
-    }
-
-    private static void HighlightedTextChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var trimmedTextBlock = sender as TrimmedTextBlock;
-      if( trimmedTextBlock != null )
-      {
-        trimmedTextBlock.HighlightedTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-      }
-    }
-
-    protected virtual void HighlightedTextChanged( string oldValue, string newValue )
-    {
-      if( this.Text.Length == 0 )
-        return;
-
-      // Set original text without highlight.
-      if( newValue == null )
-      {
-        var newrRun = new Run( this.Text );
-        this.Inlines.Clear();        
-        this.Inlines.Add( newrRun );
-
-        return;
-      }
-
-      var startHighlightedIndex = this.Text.IndexOf( newValue, StringComparison.InvariantCultureIgnoreCase );
-      var endHighlightedIndex = startHighlightedIndex + newValue.Length;
-
-      var startUnHighlightedText = this.Text.Substring( 0, startHighlightedIndex );
-      var highlightedText = this.Text.Substring( startHighlightedIndex, newValue.Length );
-      var endUnHighlightedText = this.Text.Substring( endHighlightedIndex, this.Text.Length - endHighlightedIndex );
-
-      this.Inlines.Clear();
-
-      // Start Un-Highlighted text
-      var run = new Run( startUnHighlightedText );
-      this.Inlines.Add( run );
-
-      // Highlighted text
-      run = new Run( highlightedText );
-      run.Background = this.HighlightedBrush;
-      this.Inlines.Add( run );
-
-      // End Un-Highlighted text
-      run = new Run( endUnHighlightedText );
-      this.Inlines.Add( run );
-    }
-
-    #endregion
-
-    #region Event Handler
-
-    private void TrimmedTextBlock_SizeChanged(object sender, SizeChangedEventArgs e)
-    {
-      var textBlock = sender as TextBlock;
-      if( textBlock != null )
-      {
-        this.IsTextTrimmed = this.GetIsTextTrimmed( textBlock );
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private bool GetIsTextTrimmed( TextBlock textBlock )
-    {
-      if( textBlock == null )
-        return false;
-      if( textBlock.TextTrimming == TextTrimming.None )
-        return false;
-      if( textBlock.TextWrapping != TextWrapping.NoWrap )
-        return false;
-
-      var textBlockActualWidth = textBlock.ActualWidth;
-      textBlock.Measure( new Size( double.MaxValue, double.MaxValue ) );
-      var textBlockDesiredWidth = textBlock.DesiredSize.Width;
-
-      return ( textBlockActualWidth < textBlockDesiredWidth );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 58950ea9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,1306 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:pgconv="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Converters"
-                    xmlns:editor="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Editors"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:utilities="clr-namespace:Xceed.Wpf.Toolkit.Core.Utilities"
-                    xmlns:commands="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Commands"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../NumericUpDown/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../DateTimeUpDown/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../TimeSpanUpDown/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../WatermarkTextBox/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../ColorPicker/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../CollectionControl/Themes/Aero2.NormalColor.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- PropertyGrid                                                                    -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:HalfConverter x:Key="HalfConverter" />
-  <conv:NullToBoolConverter x:Key="NullToBoolConverter" />
-  <pgconv:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
-  <pgconv:ObjectToUIElementConverter x:Key="ObjectToUIElementConverter" />
-  <pgconv:IsStringEmptyConverter x:Key="IsStringEmptyConverter" />
-  <pgconv:IsDefaultCategoryConverter x:Key="IsDefaultCategoryConverter" />
-  <pgconv:SelectedObjectConverter x:Key="objectConverter" />
-  <pgconv:PropertyItemEditorConverter x:Key="PropertyItemEditorConverter" />
-
-  <x:Static x:Key="EmptyString"
-            Member="sys:String.Empty" />
-
-  <!-- PropertyGrid numeric Editors -->
-  <Style x:Key="PropertyGridNumericUpDown"
-         TargetType="{x:Type prim:InputBase}"
-         BasedOn="{StaticResource NumericUpDown}">
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDecimalUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDoubleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorLongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorSingleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid DateTime Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorDateTimeUpDown}"
-         BasedOn="{StaticResource DateTimeUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TimeSpan Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTimeSpanUpDown}"
-         BasedOn="{StaticResource TimeSpanUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid ComboBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorComboBox}"
-         BasedOn="{StaticResource {x:Type ComboBox}}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="Background"
-                Value="Transparent" />
-      </MultiTrigger>
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="Foreground"
-                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid CheckBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCheckBox}"
-         BasedOn="{StaticResource {x:Type CheckBox}}">
-    <Setter Property="Margin"
-            Value="5,0,0,0" />
-  </Style>
-
-  <!-- PropertyGrid TextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBox}"
-         BasedOn="{StaticResource WatermarkTextBox}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TextBlock Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBlock}"
-         BasedOn="{StaticResource {x:Type TextBlock}}">
-    <Setter Property="Foreground"
-            Value="Gray" />
-  </Style>
-
-  <!-- PropertyGrid MaskedTextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorMaskedTextBox}"
-         BasedOn="{StaticResource {x:Type TextBox}}">
-  </Style>
-
-  <!-- PropertyGrid ColorPicker Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorColorPicker}"
-         BasedOn="{StaticResource ColorPicker}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowDropDownButton"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-  <!-- PropertyGrid PrimitiveTypeCollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorPrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}">
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-  </Style>
-
-  <!-- PropertyGrid CollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCollectionControl}"
-         BasedOn="{StaticResource CollectionControlButton}">
-  </Style>
-
-  <!-- ===============================================================================   -->
-  <!-- Style for all internal derived types of NumericUpDown will be done in code-behind -->
-  <!-- for external themes to redefine the default style. The reason is that the         -->
-  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
-  <!-- available in code-behind (not xaml).                                              -->
-  <!-- (ex. Office2007 theme)                                                            -->
-  <!-- ===============================================================================   -->
-
-  <!-- Internal PropertyGrid numeric Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorSByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorULongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-
-
-  <Style x:Key="OptionsToggleButtonStyle"
-         TargetType="{x:Type RadioButton}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderBrush"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Height"
-            Value="22" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="ToolTipService.InitialShowDelay"
-            Value="900" />
-    <Setter Property="ToolTipService.ShowDuration"
-            Value="20000" />
-    <Setter Property="ToolTipService.BetweenShowDelay"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RadioButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    CornerRadius="0" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="0">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="0"
-                      Padding="{TemplateBinding Padding}">
-                <StackPanel x:Name="StackPanel"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                  <ContentPresenter x:Name="Content"
-                                    Content="{TemplateBinding Content}"
-                                    Margin="1"
-                                    RenderOptions.BitmapScalingMode="NearestNeighbor"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                </StackPanel>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Opacity"
-                      TargetName="Content"
-                      Value="0.5" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ClearFilterButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderBrush"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Height"
-            Value="22" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="ToolTipService.InitialShowDelay"
-            Value="900" />
-    <Setter Property="ToolTipService.ShowDuration"
-            Value="20000" />
-    <Setter Property="ToolTipService.BetweenShowDelay"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Button}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    CornerRadius="0" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="0">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="0"
-                      Padding="{TemplateBinding Padding}">
-                <StackPanel x:Name="StackPanel"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                  <ContentPresenter x:Name="Content"
-                                    Content="{TemplateBinding Content}"
-                                    Margin="1"
-                                    RenderOptions.BitmapScalingMode="NearestNeighbor"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                </StackPanel>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Opacity"
-                      TargetName="Content"
-                      Value="0.5" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <SolidColorBrush x:Key="GlyphBrush"
-                   Color="Black" />
-
-  <ControlTemplate x:Key="ExpanderToggleButton"
-                   TargetType="{x:Type ToggleButton}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="20" />
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <Rectangle Margin="0,0,0,0"
-                 x:Name="Rectangle"
-                 Fill="Transparent" />
-      <Path HorizontalAlignment="Center"
-            x:Name="Up_Arrow"
-            VerticalAlignment="Center"
-            Fill="{StaticResource GlyphBrush}"
-            Data="M 0 0 L 4 4 L 8 0 Z"
-            RenderTransformOrigin="0.5,0.5">
-        <Path.RenderTransform>
-          <TransformGroup>
-            <ScaleTransform ScaleX="1"
-                            ScaleY="1" />
-            <SkewTransform AngleX="0"
-                           AngleY="0" />
-            <RotateTransform Angle="-90" />
-            <TranslateTransform X="0"
-                                Y="0" />
-          </TransformGroup>
-        </Path.RenderTransform>
-      </Path>
-      <Path Visibility="Collapsed"
-            HorizontalAlignment="Center"
-            x:Name="Down_Arrow"
-            VerticalAlignment="Center"
-            Fill="{StaticResource GlyphBrush}"
-            Data="M 0 4 L 4 0 L 8 4 Z"
-            RenderTransformOrigin="0.5,0.5">
-        <Path.RenderTransform>
-          <TransformGroup>
-            <ScaleTransform ScaleX="1"
-                            ScaleY="1" />
-            <SkewTransform AngleX="0"
-                           AngleY="0" />
-            <RotateTransform Angle="135" />
-            <TranslateTransform X="0"
-                                Y="0" />
-          </TransformGroup>
-        </Path.RenderTransform>
-      </Path>
-
-      <ContentPresenter Grid.Column="1" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsChecked"
-               Value="true">
-        <Setter Property="Visibility"
-                Value="Visible"
-                TargetName="Down_Arrow" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="Up_Arrow" />
-        <Setter Property="OpacityMask"
-                TargetName="Down_Arrow"
-                Value="#FF000000" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <Style x:Key="ExpanderStyle"
-         TargetType="{x:Type Expander}">
-    <Setter Property="Padding"
-            Value="0" />
-    <Setter Property="Background"
-            Value="#FFF0F0F0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Expander}">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="*"
-                             x:Name="ContentRow" />
-            </Grid.RowDefinitions>
-            <Border x:Name="Border"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="#FFF0F0F0">
-              <ToggleButton Template="{StaticResource ExpanderToggleButton}"
-                            IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            OverridesDefaultStyle="True">
-                <ContentPresenter Margin="1"
-                                  RecognizesAccessKey="True"
-                                  ContentSource="Header"
-                                  TextElement.FontWeight="Bold" />
-              </ToggleButton>
-            </Border>
-            <Border Visibility="Collapsed"
-                    Grid.Row="1"
-                    x:Name="ExpandSite"
-                    Background="{x:Static SystemColors.ControlBrush}"
-                    Padding="10 0 0 0">
-              <Border BorderThickness="0"
-                      Margin="0"
-                      Padding="0"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  Margin="{TemplateBinding Padding}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  Focusable="false" />
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsExpanded"
-                     Value="True">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="ExpandSite" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="PropertyExpanderStyle"
-         TargetType="{x:Type Expander}">
-    <Setter Property="Padding"
-            Value="10 0 0 0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Expander}">
-          <Grid>
-            <Border Visibility="Collapsed"
-                    Grid.Row="1"
-                    x:Name="ExpandSite"
-                    Padding="0 0 0 0">
-              <Border BorderThickness="0"
-                      Margin="0"
-                      Padding="0"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  Focusable="false" />
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsExpanded"
-                     Value="True">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="ExpandSite" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="PropertyItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Style.Resources>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border>
-            <Expander x:Name="expander"
-                      Header="{Binding Name}"
-                      Style="{StaticResource ExpanderStyle}"
-                      IsExpanded="True">
-              <ItemsPresenter />
-            </Expander>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-
-    <Style.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding Name, Converter={StaticResource IsDefaultCategoryConverter}}"
-                     Value="True" />
-          <Condition Binding="{Binding IsMiscCategoryLabelHidden, RelativeSource={RelativeSource AncestorType={x:Type pg:PropertyGrid}}}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type GroupItem}">
-              <!-- No Expander for the Misc Category if IsMiscCategoryLabelHidden == true-->
-              <ItemsPresenter />
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </MultiDataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="SingleDefaultCategoryItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <!-- No Expander for the Misc Category if Misc category is the only category-->
-          <ItemsPresenter />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <ContextMenu x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}">
-    <MenuItem Header="Reset Value"
-              Command="commands:PropertyItemCommands.ResetValue"
-              CommandParameter="{Binding}"
-              CommandTarget="{Binding Path=PlacementTarget, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContextMenu}}}"/>
-  </ContextMenu>
-
-  <pg:CategoryGroupStyleSelector x:Key="categoryGroupStyleSelector"
-                                 SingleDefaultCategoryItemGroupStyle="{StaticResource SingleDefaultCategoryItemGroupContainerStyle}"
-                                 ItemGroupStyle="{StaticResource PropertyItemGroupContainerStyle}" />
-
-  <Style TargetType="{x:Type pg:PropertyItemBase}">
-    <Setter Property="Background"
-            Value="{x:Static SystemColors.WindowBrush}" />
-    <!-- Set the margin at 1 pixel bottom to let the horizontal "line" effect appear. -->
-    <Setter Property="Margin"
-            Value="0,0,0,1" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type pg:PropertyItemBase}">
-          <Border ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                  ContextMenuService.Placement="Bottom">
-            <Grid VerticalAlignment="Stretch"
-                  HorizontalAlignment="Stretch">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type pg:PropertyGrid}}}" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-              <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-
-              <!-- Set the BorderThickness at 1 pixel to the right to let the "vertical line" appear -->
-              <Border x:Name="PART_Name"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Margin="0,0,1,0"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <Grid Margin="2,2,2,2"
-                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid Margin="{Binding Level, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ExpandableObjectMarginConverter}}">
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="15" />
-                      <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <ToggleButton x:Name="_expandableButton"
-                                  Grid.Column="0"
-                                  Template="{StaticResource ExpanderToggleButton}"
-                                  OverridesDefaultStyle="True"
-                                  IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                    </ToggleButton>
-
-                    <pg:TrimmedTextBlock x:Name="_text"
-                                         Grid.Column="1"
-                                         Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HighlightedText="{Binding HighlightedText, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HorizontalAlignment="Stretch"
-                                         VerticalAlignment="Center"
-                                         TextTrimming="CharacterEllipsis"
-                                         IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
-                      </pg:TrimmedTextBlock>
-                  </Grid>
-
-                  <Grid Grid.Column="1"
-                        HorizontalAlignment="Right"
-                        Margin="5,0,5,0"
-                        Visibility="{Binding ShowAdvancedOptions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                        utilities:ContextMenuUtilities.OpenOnMouseLeftButtonClick="True"
-                        ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}">
-
-                    <!-- ImageSource is set in Triggers for others Themes to set their proper icons -->
-                    <Image x:Name="_optionsImage"
-                           Width="11"
-                           Height="11"
-                           ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" >
-                    </Image>
-                  </Grid>
-                </Grid>
-              </Border>
-
-              <Border x:Name="PART_Editor"
-                      Grid.Column="1"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      KeyboardNavigation.DirectionalNavigation="None"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <Border.ToolTip>
-                  <ToolTip Visibility="Collapsed" />
-                </Border.ToolTip>
-                <ContentControl x:Name="PART_ValueContainer"
-                                Focusable="False"
-                                IsTabStop="False"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                  <ContentControl.Content>
-                    <MultiBinding Converter="{StaticResource PropertyItemEditorConverter}">
-                      <Binding Path="Editor" 
-                               RelativeSource="{RelativeSource TemplatedParent}" />
-                      <Binding Path="IsReadOnly"
-                               RelativeSource="{RelativeSource AncestorType={x:Type pg:PropertyGrid}}" />
-                    </MultiBinding>
-                  </ContentControl.Content>
-                </ContentControl>
-              </Border>
-
-              <Expander x:Name="_propertyExpander"
-                        Grid.ColumnSpan="2"
-                        Grid.Row="1"
-                        IsExpanded="{TemplateBinding IsExpanded}"
-                        Style="{StaticResource PropertyExpanderStyle}"
-                        IsEnabled="True">
-                <pg:PropertyItemsControl x:Name="PART_PropertyItemsControl"
-                                         IsTabStop="False"
-                                         Focusable="False"
-                                         ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
-                                         ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
-                                         VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                         VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                         ScrollViewer.CanContentScroll="True">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </pg:PropertyItemsControl>
-              </Expander>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="PART_Name"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-            </Trigger>
-            <Trigger Property="IsSelected"
-                     Value="True">
-              <Setter TargetName="PART_Name"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      TargetName="PART_ValueContainer"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-              <Setter Property="Foreground"
-                      TargetName="_text"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding ShowDescriptionByTooltip, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                           Value="True" />
-                <Condition Binding="{Binding Description, RelativeSource={RelativeSource Self}, Converter={StaticResource IsStringEmptyConverter}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="ToolTipService.ToolTip"
-                      Value="{Binding Description, RelativeSource={RelativeSource TemplatedParent}}"
-                      TargetName="PART_Name" />
-            </MultiDataTrigger>
-            <Trigger Property="Validation.HasError"
-                     Value="true">
-              <Setter Property="ToolTip"
-                      Value="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-            </Trigger>
-            <Trigger Property="Visibility"
-                     Value="Visible"
-                     SourceName="_expandableButton">
-              <Setter Property="Focusable"
-                      Value="False" />
-            </Trigger>
-
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Local}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Local11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Resource}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Resource11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Databinding}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Database11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Inheritance}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Inheritance11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.StyleSetter}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Style11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Default}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/AdvancedProperties11.png" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type pg:PropertyGrid}">
-    <Setter Property="AdvancedOptionsMenu"
-            Value="{StaticResource {ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="SelectedObjectType"
-            Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=Type}" />
-    <Setter Property="SelectedObjectTypeName"
-            Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=TypeName}" />
-    <Setter Property="SelectedObjectName"
-            Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=SelectedObjectName}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type pg:PropertyGrid}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid Margin="{TemplateBinding Padding}">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition />
-                <RowDefinition Height="5" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-
-              <StackPanel x:Name="selectObjectNamePanel"
-                          Orientation="Horizontal">
-                <Border Background="White"
-                        BorderBrush="Black"
-                        Visibility="{Binding ShowPreview, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                        BorderThickness="1"
-                        Width="44"
-                        Height="44"
-                        Margin="6,4,0,4"
-                        Padding="2">
-                  <Rectangle>
-                    <Rectangle.Fill>
-                      <VisualBrush Stretch="Uniform"
-                                   Visual="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ObjectToUIElementConverter}, Path=SelectedObject}" />
-                    </Rectangle.Fill>
-                  </Rectangle>
-                </Border>
-                <StackPanel Orientation="Horizontal"
-                            VerticalAlignment="Center"
-                            Margin="6,2,6,4"
-                            Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectTypeName}"
-                                         TextTrimming="CharacterEllipsis"
-                                         FontWeight="Bold" >
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}"
-                        Margin="5,0,0,0">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectName}"
-                                         TextTrimming="CharacterEllipsis">
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                </StackPanel>
-              </StackPanel>
-
-
-              <Grid x:Name="toolsContainer"
-                    Grid.Row="1"
-                    Margin="4,0,4,4">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Grid x:Name="sortButtonContainer"
-                      Margin="4"
-                      Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                  <StackPanel Orientation="Horizontal"
-                              Margin="1">
-                    <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}"
-                                 VerticalAlignment="Center"
-                                 Style="{StaticResource OptionsToggleButtonStyle}"
-                                 ToolTip="Categorized">
-                      <Image Source="./../Images/Categorize16.png"
-                             Width="16"
-                             Height="16" >
-                      </Image>
-                    </RadioButton>
-                    <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
-                                 VerticalAlignment="Center"
-                                 Style="{StaticResource OptionsToggleButtonStyle}"
-                                 ToolTip="Alphabetical">
-                      <Image Source="./../Images/SortAscending16.png"
-                             Width="16"
-                             Height="16" >
-                      </Image>
-                    </RadioButton>
-                  </StackPanel>
-                </Grid>
-
-                <Border x:Name="searchBoxContainer"
-                        Grid.Column="1"
-                        Margin="4,4,0,4"
-                        Background="White"
-                        BorderBrush="Gray"
-                        BorderThickness="1"
-                        Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="*" />
-                      <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <local:WatermarkTextBox x:Name="_txtFilter"
-                                            Background="Transparent"
-                                            Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
-                                            Watermark="{TemplateBinding FilterWatermark}"
-                                            BorderThickness="1">
-                      <local:WatermarkTextBox.Style>
-                        <Style TargetType="Control">
-                          <Setter Property="BorderBrush"
-                                  Value="Transparent" />
-                          <Style.Triggers>
-                            <Trigger Property="IsMouseOver"
-                                     Value="True">
-                              <Setter Property="BorderBrush"
-                                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-                            </Trigger>
-                          </Style.Triggers>
-                        </Style>
-                      </local:WatermarkTextBox.Style>
-
-                    </local:WatermarkTextBox>
-
-                    <Button Grid.Column="1"
-                            Command="commands:PropertyGridCommands.ClearFilter"
-                            Style="{StaticResource ClearFilterButtonStyle}"
-                            HorizontalAlignment="Left">
-                      <Image Source="./../Images/ClearFilter16.png"
-                             Width="16"
-                             Height="16" >
-                      </Image>
-                    </Button>
-                  </Grid>
-                </Border>
-              </Grid>
-
-              <Grid Grid.Row="2"
-                    Background="{x:Static SystemColors.WindowBrush}">
-                <pg:PropertyItemsControl x:Name="PART_PropertyItemsControl"
-                                         IsTabStop="False"
-                                         Focusable="False"
-                                         ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
-                                         ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
-                                         Background="{x:Static SystemColors.ControlBrush}"
-                                         VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource TemplatedParent}}"
-                                         VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                         ScrollViewer.CanContentScroll="True"
-                                         VerticalAlignment="Top">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer x:Name="ScrollBar"
-                                      Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="Disabled">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                      <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding ShowHorizontalScrollBar, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                     Value="True">
-                          <Setter Property="HorizontalScrollBarVisibility"
-                                  Value="Auto"
-                                  TargetName="ScrollBar" />
-                        </DataTrigger>
-                      </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </pg:PropertyItemsControl>
-
-                <Thumb x:Name="PART_DragThumb"
-                       HorizontalAlignment="Left"
-                       Width="5"
-                       Margin="6,0,0,0"
-                       Cursor="SizeWE">
-                  <Thumb.Template>
-                    <ControlTemplate>
-                      <Border Background="Transparent" />
-                    </ControlTemplate>
-                  </Thumb.Template>
-                </Thumb>
-
-              </Grid>
-
-              <GridSplitter Height="3"
-                            Grid.Row="3"
-                            HorizontalAlignment="Stretch"
-                            Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-              </GridSplitter>
-              <StackPanel Grid.Row="4"
-                          Margin="0,0,0,5"
-                          Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                <TextBlock Padding="2 2 2 0"
-                           FontWeight="Bold"
-                           Text="{Binding SelectedPropertyItem.DisplayName, RelativeSource={RelativeSource TemplatedParent}}">
-                </TextBlock>
-                <TextBlock Padding="5 2 2 0"
-                           TextWrapping="WrapWithOverflow"
-                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}">
-                </TextBlock>
-              </StackPanel>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition SourceName="searchBoxContainer"
-                           Property="Visibility"
-                           Value="Collapsed" />
-                <Condition SourceName="sortButtonContainer"
-                           Property="Visibility"
-                           Value="Collapsed" />
-              </MultiTrigger.Conditions>
-              <Setter TargetName="toolsContainer"
-                      Property="Visibility"
-                      Value="Collapsed" />
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
deleted file mode 100644
index 215239fd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
+++ /dev/null
@@ -1,1425 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:editor="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Editors"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:pgconv="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Converters"
-                    xmlns:utilities="clr-namespace:Xceed.Wpf.Toolkit.Core.Utilities"
-                    xmlns:commands="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Commands"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../NumericUpDown/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../DateTimeUpDown/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../TimeSpanUpDown/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../WatermarkTextBox/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../ColorPicker/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../CollectionControl/Themes/Generic.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- PropertyGrid                                                                    -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:HalfConverter x:Key="HalfConverter" />
-  <conv:NullToBoolConverter x:Key="NullToBoolConverter" />
-  <pgconv:ObjectToUIElementConverter x:Key="ObjectToUIElementConverter" />
-  <pgconv:IsStringEmptyConverter x:Key="IsStringEmptyConverter" />
-  <pgconv:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
-  <pgconv:IsDefaultCategoryConverter x:Key="IsDefaultCategoryConverter" />
-  <pgconv:SelectedObjectConverter x:Key="objectConverter" />
-  <pgconv:PropertyItemEditorConverter x:Key="PropertyItemEditorConverter" />
-
-  <x:Static x:Key="EmptyString"
-            Member="sys:String.Empty" />
-
-  <!-- PropertyGrid numeric Editors -->
-  <Style x:Key="PropertyGridNumericUpDown"
-         TargetType="{x:Type prim:InputBase}"
-         BasedOn="{StaticResource NumericUpDown}">
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDecimalUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDoubleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorLongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorSingleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid DateTime Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorDateTimeUpDown}"
-         BasedOn="{StaticResource DateTimeUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TimeSpan Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTimeSpanUpDown}"
-         BasedOn="{StaticResource TimeSpanUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid ComboBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorComboBox}"
-         BasedOn="{StaticResource {x:Type ComboBox}}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="Background"
-                Value="Transparent" />
-      </MultiTrigger>
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="Foreground"
-                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid CheckBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCheckBox}"
-         BasedOn="{StaticResource {x:Type CheckBox}}">
-    <Setter Property="Margin"
-            Value="5,0,0,0" />
-  </Style>
-
-  <!-- PropertyGrid TextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBox}"
-         BasedOn="{StaticResource WatermarkTextBox}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEnabled"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderThickness"
-                Value="0" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TextBlock Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBlock}"
-         BasedOn="{StaticResource {x:Type TextBlock}}">
-    <Setter Property="Foreground"
-            Value="Gray" />
-  </Style>
-
-  <!-- PropertyGrid MaskedTextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorMaskedTextBox}"
-         BasedOn="{StaticResource {x:Type TextBox}}">
-  </Style>
-
-  <!-- PropertyGrid ColorPicker Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorColorPicker}"
-         BasedOn="{StaticResource {x:Type local:ColorPicker}}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowDropDownButton"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-  <!-- PropertyGrid PrimitiveTypeCollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorPrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}">
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-  </Style>
-
-  <!-- PropertyGrid CollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCollectionControl}"
-         BasedOn="{StaticResource CollectionControlButton}">
-  </Style>
-
-  <!-- ===============================================================================   -->
-  <!-- Style for all internal derived types of NumericUpDown will be done in code-behind -->
-  <!-- for external themes to redefine the default style. The reason is that the         -->
-  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
-  <!-- available in code-behind (not xaml).                                              -->
-  <!-- (ex. Office2007 theme)                                                            -->
-  <!-- ===============================================================================   -->
-
-  <!-- Internal PropertyGrid numeric Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorSByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorULongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-
-  <SolidColorBrush x:Key="MouseOverBorderBrush"
-                   Color="#FFFFB700" />
-  <LinearGradientBrush x:Key="MouseOverBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFEFBF4" />
-    <GradientStop Offset="0.19"
-                  Color="#FFFDE7CE" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFDDEB8" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFCE6B" />
-    <GradientStop Offset="0.79"
-                  Color="#FFFFDE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFFFEBAA" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="CheckedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="CheckedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFFDCA0" />
-    <GradientStop Offset="0.18"
-                  Color="#FFFFD692" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFC45D" />
-    <GradientStop Offset="1"
-                  Color="#FFFFD178" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="PressedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="PressedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFE3C085" />
-    <GradientStop Offset="0.19"
-                  Color="#FFF4CC89" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5C777" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5BB56" />
-    <GradientStop Offset="0.79"
-                  Color="#FFF4CE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFF3E28D" />
-  </LinearGradientBrush>
-
-  <Style x:Key="OptionsToggleButtonStyle"
-         TargetType="{x:Type RadioButton}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderBrush"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Height"
-            Value="22" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="ToolTipService.InitialShowDelay"
-            Value="900" />
-    <Setter Property="ToolTipService.ShowDuration"
-            Value="20000" />
-    <Setter Property="ToolTipService.BetweenShowDelay"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RadioButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    CornerRadius="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      Padding="{TemplateBinding Padding}">
-                <StackPanel x:Name="StackPanel"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                  <ContentPresenter x:Name="Content"
-                                    Content="{TemplateBinding Content}"
-                                    Margin="1"
-                                    RenderOptions.BitmapScalingMode="NearestNeighbor"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                </StackPanel>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Opacity"
-                      TargetName="Content"
-                      Value="0.5" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ClearFilterButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderBrush"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Height"
-            Value="22" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="ToolTipService.InitialShowDelay"
-            Value="900" />
-    <Setter Property="ToolTipService.ShowDuration"
-            Value="20000" />
-    <Setter Property="ToolTipService.BetweenShowDelay"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Button}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    CornerRadius="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      Padding="{TemplateBinding Padding}">
-                <StackPanel x:Name="StackPanel"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                  <ContentPresenter x:Name="Content"
-                                    Content="{TemplateBinding Content}"
-                                    Margin="1"
-                                    RenderOptions.BitmapScalingMode="NearestNeighbor"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                </StackPanel>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Opacity"
-                      TargetName="Content"
-                      Value="0.5" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <SolidColorBrush x:Key="GlyphBrush"
-                   Color="#FF31347C" />
-
-  <ControlTemplate x:Key="ExpanderToggleButton"
-                   TargetType="{x:Type ToggleButton}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="20" />
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <Rectangle Margin="0,0,0,0"
-                 x:Name="Rectangle"
-                 Fill="Transparent" />
-      <Path HorizontalAlignment="Center"
-            x:Name="Up_Arrow"
-            VerticalAlignment="Center"
-            Fill="{StaticResource GlyphBrush}"
-            Data="M 0 0 L 4 4 L 8 0 Z"
-            RenderTransformOrigin="0.5,0.5">
-        <Path.RenderTransform>
-          <TransformGroup>
-            <ScaleTransform ScaleX="1"
-                            ScaleY="1" />
-            <SkewTransform AngleX="0"
-                           AngleY="0" />
-            <RotateTransform Angle="-90" />
-            <TranslateTransform X="0"
-                                Y="0" />
-          </TransformGroup>
-        </Path.RenderTransform>
-      </Path>
-      <Path Visibility="Collapsed"
-            HorizontalAlignment="Center"
-            x:Name="Down_Arrow"
-            VerticalAlignment="Center"
-            Fill="{StaticResource GlyphBrush}"
-            Data="M 0 4 L 4 0 L 8 4 Z"
-            RenderTransformOrigin="0.5,0.5">
-        <Path.RenderTransform>
-          <TransformGroup>
-            <ScaleTransform ScaleX="1"
-                            ScaleY="1" />
-            <SkewTransform AngleX="0"
-                           AngleY="0" />
-            <RotateTransform Angle="135" />
-            <TranslateTransform X="0"
-                                Y="0" />
-          </TransformGroup>
-        </Path.RenderTransform>
-      </Path>
-
-      <ContentPresenter Grid.Column="1" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsChecked"
-               Value="true">
-        <Setter Property="Visibility"
-                Value="Visible"
-                TargetName="Down_Arrow" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="Up_Arrow" />
-        <Setter Property="OpacityMask"
-                TargetName="Down_Arrow"
-                Value="#FF000000" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <Style x:Key="ExpanderStyle"
-         TargetType="{x:Type Expander}">
-    <Setter Property="Padding"
-            Value="0" />
-    <Setter Property="Background"
-            Value="#FFF0F0F0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Expander}">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="*"
-                             x:Name="ContentRow" />
-            </Grid.RowDefinitions>
-            <Border x:Name="Border"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="#FFF0F0F0">
-              <ToggleButton Template="{StaticResource ExpanderToggleButton}"
-                            IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            OverridesDefaultStyle="True">
-                <ContentPresenter Margin="1"
-                                  RecognizesAccessKey="True"
-                                  ContentSource="Header"
-                                  TextElement.FontWeight="Bold" />
-              </ToggleButton>
-            </Border>
-            <Border Visibility="Collapsed"
-                    Grid.Row="1"
-                    x:Name="ExpandSite"
-                    Background="{x:Static SystemColors.ControlBrush}"
-                    Padding="10 0 0 0">
-              <Border BorderThickness="0"
-                      Margin="0"
-                      Padding="0"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  Margin="{TemplateBinding Padding}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  Focusable="False" />
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsExpanded"
-                     Value="True">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="ExpandSite" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="PropertyExpanderStyle"
-         TargetType="{x:Type Expander}">
-    <Setter Property="Padding"
-            Value="10 0 0 0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Expander}">
-          <Grid>
-            <Border Visibility="Collapsed"
-                    Grid.Row="1"
-                    x:Name="ExpandSite"
-                    Padding="0 0 0 0">
-              <Border BorderThickness="0"
-                      Margin="0"
-                      Padding="0"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  Focusable="False" />
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsExpanded"
-                     Value="True">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="ExpandSite" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="PropertyItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Style.Resources>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border>
-            <Expander x:Name="expander"
-                      Header="{Binding Name}"
-                      Style="{StaticResource ExpanderStyle}"
-                      IsExpanded="True">
-              <ItemsPresenter />
-            </Expander>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding Name, Converter={StaticResource IsDefaultCategoryConverter}}"
-                     Value="True" />
-          <Condition Binding="{Binding IsMiscCategoryLabelHidden, RelativeSource={RelativeSource AncestorType={x:Type pg:PropertyGrid}}}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type GroupItem}">
-              <!-- No Expander for the Misc Category if IsMiscCategoryLabelHidden == true-->
-              <ItemsPresenter />
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </MultiDataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="SingleDefaultCategoryItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <!-- No Expander for the Misc Category if Misc category is the only category-->
-          <ItemsPresenter />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <ContextMenu x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}">
-    <MenuItem Header="Reset Value"
-              Command="commands:PropertyItemCommands.ResetValue"
-              CommandParameter="{Binding}"
-              CommandTarget="{Binding Path=PlacementTarget, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContextMenu}}}"/>
-  </ContextMenu>
-
-  <pg:CategoryGroupStyleSelector x:Key="categoryGroupStyleSelector"
-                                 SingleDefaultCategoryItemGroupStyle="{StaticResource SingleDefaultCategoryItemGroupContainerStyle}"
-                                 ItemGroupStyle="{StaticResource PropertyItemGroupContainerStyle}" />
-
-
-  <Style TargetType="{x:Type pg:PropertyItemBase}">
-
-    <Setter Property="Background"
-            Value="{x:Static SystemColors.WindowBrush}" />
-    <!-- Set the margin at 1 pixel bottom to let the horizontal "line" effect appear. -->
-    <Setter Property="Margin"
-            Value="0,0,0,1" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type pg:PropertyItemBase}">
-          <Border ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                  ContextMenuService.Placement="Bottom">
-            <Grid VerticalAlignment="Stretch"
-                  HorizontalAlignment="Stretch">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type pg:PropertyGrid}}}" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-              <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-
-              <!-- Set the BorderThickness at 1 pixel to the right to let the "vertical line" appear -->
-              <Border x:Name="PART_Name"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Margin="0,0,1,0"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <Grid Margin="2,2,2,2"
-                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid Margin="{Binding Level, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ExpandableObjectMarginConverter}}">
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="15" />
-                      <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <ToggleButton x:Name="_expandableButton"
-                                  Grid.Column="0"
-                                  Template="{StaticResource ExpanderToggleButton}"
-                                  OverridesDefaultStyle="True"
-                                  IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                    </ToggleButton>
-
-                    <pg:TrimmedTextBlock x:Name="_text"
-                                         Grid.Column="1"
-                                         Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HighlightedText="{Binding HighlightedText, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HorizontalAlignment="Stretch"
-                                         VerticalAlignment="Center"
-                                         TextTrimming="CharacterEllipsis"
-                                         IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-
-                  <Grid Grid.Column="1"
-                        HorizontalAlignment="Right"
-                        Margin="5,0,5,0"
-                        Visibility="{Binding ShowAdvancedOptions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                        utilities:ContextMenuUtilities.OpenOnMouseLeftButtonClick="True"
-                        ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}">
-
-                    <!-- ImageSource is set in Triggers for others Themes to set their proper icons -->
-                    <Image x:Name="_optionsImage"
-                           Width="11"
-                           Height="11"
-                           ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" >
-                    </Image>
-                  </Grid>
-                </Grid>
-              </Border>
-
-              <Border x:Name="PART_Editor"
-                      Grid.Column="1"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      KeyboardNavigation.DirectionalNavigation="None"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <Border.ToolTip>
-                  <ToolTip Visibility="Collapsed" />
-                </Border.ToolTip >
-                <ContentControl x:Name="PART_ValueContainer"
-                                Focusable="False"
-                                IsTabStop="False"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                  <ContentControl.Content>
-                    <MultiBinding Converter="{StaticResource PropertyItemEditorConverter}">
-                      <Binding Path="Editor"
-                               RelativeSource="{RelativeSource TemplatedParent}" />
-                      <Binding Path="IsReadOnly"
-                               RelativeSource="{RelativeSource AncestorType={x:Type pg:PropertyGrid}}" />
-                    </MultiBinding>
-                  </ContentControl.Content>
-                </ContentControl>
-              </Border>
-
-              <Expander x:Name="_propertyExpander"
-                        Grid.ColumnSpan="2"
-                        Grid.Row="1"
-                        IsExpanded="{TemplateBinding IsExpanded}"
-                        Style="{StaticResource PropertyExpanderStyle}"
-                        IsEnabled="True">
-                <pg:PropertyItemsControl x:Name="PART_PropertyItemsControl"
-                                         IsTabStop="False"
-                                         Focusable="False"
-                                         ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
-                                         ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
-                                         VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                         VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                         ScrollViewer.CanContentScroll="True">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </pg:PropertyItemsControl>
-              </Expander>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="PART_Name"
-                      Property="Background"
-                      Value="#CED4DF" />
-            </Trigger>
-            <Trigger Property="IsSelected"
-                     Value="True">
-              <Setter TargetName="PART_Name"
-                      Property="Background"
-                      Value="#43577B" />
-              <Setter TargetName="PART_Name"
-                      Property="TextElement.Foreground"
-                      Value="White" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      TargetName="PART_ValueContainer"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-              <Setter Property="Foreground"
-                      TargetName="_text"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding ShowDescriptionByTooltip, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                           Value="True" />
-                <Condition Binding="{Binding Description, RelativeSource={RelativeSource Self}, Converter={StaticResource IsStringEmptyConverter}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="ToolTipService.ToolTip"
-                      Value="{Binding Description, RelativeSource={RelativeSource TemplatedParent}}"
-                      TargetName="PART_Name" />
-            </MultiDataTrigger>
-            <Trigger Property="Validation.HasError"
-                     Value="true">
-              <Setter Property="ToolTip"
-                      Value="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-            </Trigger>
-            <Trigger Property="Visibility"
-                     Value="Visible"
-                     SourceName="_expandableButton">
-              <Setter Property="Focusable"
-                      Value="False" />
-            </Trigger>
-
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Local}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Local11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Resource}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Resource11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Databinding}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Database11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Inheritance}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Inheritance11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.StyleSetter}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Style11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Default}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/AdvancedProperties11.png" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type pg:PropertyGrid}">
-    <Setter Property="AdvancedOptionsMenu"
-            Value="{StaticResource {ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}}" />
-    <Setter Property="Background"
-            Value="#BCC7D8" />
-    <Setter Property="BorderBrush"
-            Value="#43577B" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="SelectedObjectType"
-            Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=Type}" />
-    <Setter Property="SelectedObjectTypeName"
-            Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=TypeName}" />
-    <Setter Property="SelectedObjectName"
-            Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=SelectedObjectName}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type pg:PropertyGrid}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid Margin="{TemplateBinding Padding}">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition />
-                <RowDefinition Height="5" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-
-              <StackPanel x:Name="selectObjectNamePanel"
-                          Orientation="Horizontal">
-                <Border Background="White"
-                        BorderBrush="Black"
-                        Visibility="{Binding ShowPreview, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                        BorderThickness="1"
-                        Width="44"
-                        Height="44"
-                        Margin="6,4,0,4"
-                        Padding="2">
-                  <Rectangle>
-                    <Rectangle.Fill>
-                      <VisualBrush Stretch="Uniform"
-                                   Visual="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ObjectToUIElementConverter}, Path=SelectedObject}" />
-                    </Rectangle.Fill>
-                  </Rectangle>
-                </Border>
-                <StackPanel Orientation="Horizontal"
-                            VerticalAlignment="Center"
-                            Margin="6,2,6,4"
-                            Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectTypeName}"
-                                         TextTrimming="CharacterEllipsis"
-                                         FontWeight="Bold" >
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}"
-                        Margin="5,0,0,0">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectName}"
-                                         TextTrimming="CharacterEllipsis" >
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                </StackPanel>
-              </StackPanel>
-
-
-              <Grid x:Name="toolsContainer"
-                    Grid.Row="1"
-                    Margin="4,0,4,4">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Grid x:Name="sortButtonContainer"
-                      Margin="4"
-                      Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                  <StackPanel Orientation="Horizontal"
-                              Margin="1">
-                    <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}"
-                                 VerticalAlignment="Center"
-                                 Style="{StaticResource OptionsToggleButtonStyle}"
-                                 ToolTip="Categorized">
-                      <Image Source="./../Images/Categorize16.png"
-                             Width="16"
-                             Height="16" >
-                      </Image>
-                    </RadioButton>
-                    <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
-                                 VerticalAlignment="Center"
-                                 Style="{StaticResource OptionsToggleButtonStyle}"
-                                 ToolTip="Alphabetical">
-                      <Image Source="./../Images/SortAscending16.png"
-                             Width="16"
-                             Height="16" >
-                      </Image>
-                    </RadioButton>
-                  </StackPanel>
-                </Grid>
-
-                <Border x:Name="searchBoxContainer"
-                        Grid.Column="1"
-                        Margin="4,4,0,4"
-                        Background="White"
-                        BorderBrush="Gray"
-                        BorderThickness="1"
-                        Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="*" />
-                      <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <local:WatermarkTextBox x:Name="_txtFilter"
-                                            Background="Transparent"
-                                            Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
-                                            Watermark="{TemplateBinding FilterWatermark}"
-                                            BorderThickness="1">
-                      <local:WatermarkTextBox.Style>
-                        <Style TargetType="Control">
-                          <Setter Property="BorderBrush"
-                                  Value="Transparent" />
-                          <Style.Triggers>
-                            <Trigger Property="IsMouseOver"
-                                     Value="True">
-                              <Setter Property="BorderBrush"
-                                      Value="{StaticResource MouseOverBorderBrush}" />
-                            </Trigger>
-                          </Style.Triggers>
-                        </Style>
-                      </local:WatermarkTextBox.Style>
-
-                    </local:WatermarkTextBox>
-
-                    <Button Grid.Column="1"
-                            Command="commands:PropertyGridCommands.ClearFilter"
-                            Style="{StaticResource ClearFilterButtonStyle}"
-                            HorizontalAlignment="Left">
-                      <Image Source="./../Images/ClearFilter16.png"
-                             Width="16"
-                             Height="16" >
-                      </Image>
-                    </Button>
-                  </Grid>
-                </Border>
-              </Grid>
-
-              <Grid Grid.Row="2"
-                    Background="{x:Static SystemColors.WindowBrush}">
-                <pg:PropertyItemsControl  x:Name="PART_PropertyItemsControl"
-                                          IsTabStop="False"
-                                          Focusable="False"
-                                          ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
-                                          ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
-                                          Background="{x:Static SystemColors.ControlBrush}"
-                                          VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource TemplatedParent}}"
-                                          VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                          ScrollViewer.CanContentScroll="True"
-                                          VerticalAlignment="Top">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer x:Name="ScrollBar"
-                                      Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="Disabled">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                      <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding ShowHorizontalScrollBar, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                     Value="True">
-                          <Setter Property="HorizontalScrollBarVisibility"
-                                  Value="Auto"
-                                  TargetName="ScrollBar" />
-                        </DataTrigger>
-                      </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </pg:PropertyItemsControl>
-
-                <Thumb x:Name="PART_DragThumb"
-                       HorizontalAlignment="Left"
-                       Width="5"
-                       Margin="6,0,0,0"
-                       Cursor="SizeWE">
-                  <Thumb.Template>
-                    <ControlTemplate>
-                      <Border Background="Transparent" />
-                    </ControlTemplate>
-                  </Thumb.Template>
-                </Thumb>
-
-              </Grid>
-
-              <GridSplitter Height="3"
-                            Grid.Row="3"
-                            HorizontalAlignment="Stretch"
-                            Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-               </GridSplitter>
-               <StackPanel Grid.Row="4"
-                          Margin="0,0,0,5"
-                          Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                <TextBlock Padding="2 2 2 0"
-                           FontWeight="Bold"
-                           Text="{Binding SelectedPropertyItem.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" >
-                </TextBlock>
-                <TextBlock Padding="5 2 2 0"
-                           TextWrapping="WrapWithOverflow"
-                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" >
-                </TextBlock>
-              </StackPanel>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition SourceName="searchBoxContainer"
-                           Property="Visibility"
-                           Value="Collapsed" />
-                <Condition SourceName="sortButtonContainer"
-                           Property="Visibility"
-                           Value="Collapsed" />
-              </MultiTrigger.Conditions>
-              <Setter TargetName="toolsContainer"
-                      Property="Visibility"
-                      Value="Collapsed" />
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs
deleted file mode 100644
index a36deced..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Converters
-{
-  [Obsolete("This class is no longer used internaly and may be removed in a future release")]
-  public class SliderThumbWidthConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is Slider )
-      {
-        string param = parameter.ToString();
-        if( param == "0" )
-          return RangeSlider.GetThumbWidth( ( Slider )value );
-        else if( param == "1" )
-          return RangeSlider.GetThumbHeight( ( Slider )value );
-      }
-      return 0d;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
deleted file mode 100644
index 40528354..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
+++ /dev/null
@@ -1,1083 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows.Controls;
-using System.Windows;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_LowerRange, Type = typeof( RepeatButton ) )]
-  [TemplatePart( Name = PART_HigherRange, Type = typeof( RepeatButton ) )]
-  [TemplatePart( Name = PART_HigherSlider, Type = typeof( Slider ) )]
-  [TemplatePart( Name = PART_LowerSlider, Type = typeof( Slider ) )]
-  [TemplatePart( Name = PART_Track, Type = typeof( Track ) )]
-
-  public class RangeSlider : Control
-  {
-    #region Members
-
-    private const String PART_LowerRange = "PART_LowerRange";
-    private const String PART_Range = "PART_Range";
-    private const String PART_HigherRange = "PART_HigherRange";
-    private const String PART_HigherSlider = "PART_HigherSlider";
-    private const String PART_LowerSlider = "PART_LowerSlider";
-    private const String PART_Track = "PART_Track";
-
-    private RepeatButton _lowerRange;
-    private RepeatButton _higherRange;
-    private Slider _lowerSlider;
-    private Slider _higherSlider;
-    private Track _lowerTrack;
-    private Track _higherTrack;
-    private double _deferredUpdateValue;
-
-    #endregion Members
-
-    #region Constructors
-
-    static RangeSlider()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( RangeSlider ), new FrameworkPropertyMetadata( typeof( RangeSlider ) ) );
-    }
-
-    public RangeSlider()
-    {
-      this.SizeChanged += this.RangeSlider_SizeChanged;
-    }
-
-    #endregion Constructors
-
-    #region Properties
-
-    #region AutoToolTipPlacement
-
-    public static readonly DependencyProperty AutoToolTipPlacementProperty = DependencyProperty.Register( "AutoToolTipPlacement", typeof( AutoToolTipPlacement ), typeof( RangeSlider ),
-        new FrameworkPropertyMetadata( AutoToolTipPlacement.None, RangeSlider.OnAutoToolTipPlacementChanged ) );
-
-    public AutoToolTipPlacement AutoToolTipPlacement
-    {
-      get
-      {
-        return (AutoToolTipPlacement)GetValue( RangeSlider.AutoToolTipPlacementProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.AutoToolTipPlacementProperty, value );
-      }
-    }
-
-    private static void OnAutoToolTipPlacementChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnAutoToolTipPlacementChanged( (AutoToolTipPlacement)e.OldValue, (AutoToolTipPlacement)e.NewValue );
-      }
-    }
-
-    protected virtual void OnAutoToolTipPlacementChanged( AutoToolTipPlacement oldValue, AutoToolTipPlacement newValue )
-    {
-    }
-
-    #endregion //AutoToolTipPlacement
-
-    #region AutoToolTipPrecision
-
-    public static readonly DependencyProperty AutoToolTipPrecisionProperty = DependencyProperty.Register( "AutoToolTipPrecision", typeof( int ), typeof( RangeSlider ),
-        new FrameworkPropertyMetadata( 0 ) );
-
-    public int AutoToolTipPrecision
-    {
-      get
-      {
-        return (int)GetValue( RangeSlider.AutoToolTipPrecisionProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.AutoToolTipPrecisionProperty, value );
-      }
-    }
-
-    #endregion //AutoToolTipPrecision
-
-    #region HigherRangeBackground
-    /// <summary>
-    /// Get/Set the Brush for the Range between Higher and Maximum values. (Brush)
-    /// </summary>
-
-    public static readonly DependencyProperty HigherRangeBackgroundProperty = DependencyProperty.Register( "HigherRangeBackground", typeof( Brush ), typeof( RangeSlider ) );
-
-    public Brush HigherRangeBackground
-    {
-      get
-      {
-        return (Brush)GetValue( RangeSlider.HigherRangeBackgroundProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.HigherRangeBackgroundProperty, value );
-      }
-    }
-
-    #endregion HigherRangeBackground
-
-    #region HigherRangeStyle
-    /// <summary>
-    /// Get/Set the Style for the Range between Higher and Maximum values. (Style)
-    /// </summary>
-
-    public static readonly DependencyProperty HigherRangeStyleProperty = DependencyProperty.Register( "HigherRangeStyle", typeof( Style ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( null ) );
-
-    public Style HigherRangeStyle
-    {
-      get
-      {
-        return (Style)this.GetValue( RangeSlider.HigherRangeStyleProperty );
-      }
-      set
-      {
-        this.SetValue( RangeSlider.HigherRangeStyleProperty, value );
-      }
-    }
-
-    #endregion HigherRangeStyle
-
-    #region HigherRangeWidth
-    /// <summary>
-    /// HigherRangeWidth property is a readonly property, used to calculate the percentage of the HigherRange within the entire min/max range.
-    /// </summary>
-    /// 
-
-    private static readonly DependencyPropertyKey HigherRangeWidthPropertyKey = DependencyProperty.RegisterAttachedReadOnly( "HigherRangeWidth", typeof( double )
-        , typeof( RangeSlider ), new PropertyMetadata( 0d ) );
-
-    public static readonly DependencyProperty HigherRangeWidthProperty = HigherRangeWidthPropertyKey.DependencyProperty;
-
-    public double HigherRangeWidth
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.HigherRangeWidthProperty );
-      }
-      private set
-      {
-        SetValue( RangeSlider.HigherRangeWidthPropertyKey, value );
-      }
-    }
-
-
-    #endregion HigherRangeWidth
-
-    #region HigherThumbBackground
-    /// <summary>
-    /// Get/Set the Brush for the HigherValue thumb's background [active state]. (Brush)
-    /// </summary>
-
-    public static readonly DependencyProperty HigherThumbBackgroundProperty = DependencyProperty.Register( "HigherThumbBackground", typeof( Brush ), typeof( RangeSlider ) );
-
-    public Brush HigherThumbBackground
-    {
-      get
-      {
-        return (Brush)GetValue( RangeSlider.HigherThumbBackgroundProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.HigherThumbBackgroundProperty, value );
-      }
-    }
-
-    #endregion HigherThumbBackground
-
-    #region HigherValue
-    /// <summary>
-    /// HigherValue property represents the higher value within the selected range.
-    /// </summary>
-    public static readonly DependencyProperty HigherValueProperty = DependencyProperty.Register( "HigherValue", typeof( double ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, RangeSlider.OnHigherValueChanged, RangeSlider.OnCoerceHigherValueChanged ) );
-
-    public double HigherValue
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.HigherValueProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.HigherValueProperty, value );
-      }
-    }
-
-    private static object OnCoerceHigherValueChanged( DependencyObject d, object basevalue )
-    {
-      var rangeSlider = (RangeSlider)d;
-      if( (rangeSlider == null) || !rangeSlider.IsLoaded)
-        return basevalue;
-
-      var min = Math.Min( rangeSlider.Minimum, rangeSlider.Maximum );
-      var max = Math.Max( rangeSlider.Minimum, rangeSlider.Maximum );
-      var higherValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, (double)basevalue ) );
-      higherValue = Math.Max( rangeSlider.LowerValue, ( double)basevalue );
-
-      return higherValue;
-    }
-
-    private static void OnHigherValueChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnHigherValueChanged( (double)args.OldValue, (double)args.NewValue );
-      }
-    }
-
-    protected virtual void OnHigherValueChanged( double oldValue, double newValue )
-    {
-      this.AdjustView();
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = RangeSlider.HigherValueChangedEvent;
-      this.RaiseEvent( args );
-    }
-
-    #endregion HigherValue
-
-    #region IsDeferredUpdateValues
-    /// <summary>
-    /// Gets/Sets if the LowerValue and HigherValue should be updated only on mouse up.
-    /// </summary>
-    public static readonly DependencyProperty IsDeferredUpdateValuesProperty = DependencyProperty.Register( "IsDeferredUpdateValues", typeof( bool ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( false ) );
-
-    public bool IsDeferredUpdateValues
-    {
-      get
-      {
-        return (bool)GetValue( RangeSlider.IsDeferredUpdateValuesProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.IsDeferredUpdateValuesProperty, value );
-      }
-    }
-
-    #endregion IsDeferredUpdateValues
-
-    #region IsSnapToTickEnabled
-
-    public static readonly DependencyProperty IsSnapToTickEnabledProperty = DependencyProperty.Register( "IsSnapToTickEnabled", typeof( bool ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( false ) );
-
-    public bool IsSnapToTickEnabled
-    {
-      get
-      {
-        return (bool)GetValue( RangeSlider.IsSnapToTickEnabledProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.IsSnapToTickEnabledProperty, value );
-      }
-    }
-
-    #endregion IsSnapToTickEnabled
-
-    #region LowerRangeBackground
-    /// <summary>
-    /// Get/Set the Brush for the Range between Minimum and Lower values. (Brush)
-    /// </summary>
-
-    public static readonly DependencyProperty LowerRangeBackgroundProperty = DependencyProperty.Register( "LowerRangeBackground", typeof( Brush ), typeof( RangeSlider ) );
-
-    public Brush LowerRangeBackground
-    {
-      get
-      {
-        return (Brush)GetValue( RangeSlider.LowerRangeBackgroundProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.LowerRangeBackgroundProperty, value );
-      }
-    }
-
-    #endregion LowerRangeBackground
-
-    #region LowerRangeStyle
-    /// <summary>
-    /// Get/Set the Style for the Range between Minimum and Lower values. (Style)
-    /// </summary>
-
-    public static readonly DependencyProperty LowerRangeStyleProperty = DependencyProperty.Register( "LowerRangeStyle", typeof( Style ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( null ) );
-
-    public Style LowerRangeStyle
-    {
-      get
-      {
-        return (Style)this.GetValue( RangeSlider.LowerRangeStyleProperty );
-      }
-      set
-      {
-        this.SetValue( RangeSlider.LowerRangeStyleProperty, value );
-      }
-    }
-
-    #endregion LowerRangeStyle
-
-    #region LowerRangeWidth
-    /// <summary>
-    /// LowerRangeWidth property is a readonly property, used to calculate the percentage of the LowerRange, within the entire min/max range.
-    /// </summary>
-    /// 
-
-    private static DependencyPropertyKey LowerRangeWidthPropertyKey = DependencyProperty.RegisterAttachedReadOnly( "LowerRangeWidth", typeof( double )
-      , typeof( RangeSlider ), new PropertyMetadata( 0d ) );
-
-    public static readonly DependencyProperty LowerRangeWidthProperty = LowerRangeWidthPropertyKey.DependencyProperty;
-
-    public double LowerRangeWidth
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.LowerRangeWidthProperty );
-      }
-      private set
-      {
-        SetValue( RangeSlider.LowerRangeWidthPropertyKey, value );
-      }
-    }
-
-    #endregion LowerRangeWidth
-
-    #region LowerThumbBackground
-    /// <summary>
-    /// Get/Set the Brush for the LowerValue thumb's background [active state]. (Brush)
-    /// </summary>
-
-    public static readonly DependencyProperty LowerThumbBackgroundProperty = DependencyProperty.Register( "LowerThumbBackground", typeof( Brush ), typeof( RangeSlider ) );
-
-    public Brush LowerThumbBackground
-    {
-      get
-      {
-        return (Brush)GetValue( RangeSlider.LowerThumbBackgroundProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.LowerThumbBackgroundProperty, value );
-      }
-    }
-
-    #endregion LowerThumbBackground
-
-    #region LowerValue
-    /// <summary>
-    /// LowerValue property represents the lower value within the selected range.
-    /// </summary>
-    public static readonly DependencyProperty LowerValueProperty = DependencyProperty.Register( "LowerValue", typeof( double ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, RangeSlider.OnLowerValueChanged, RangeSlider.OnCoerceLowerValueChanged ) );
-
-    public double LowerValue
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.LowerValueProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.LowerValueProperty, value );
-      }
-    }
-
-    private static object OnCoerceLowerValueChanged( DependencyObject d, object basevalue )
-    {
-      var rangeSlider = (RangeSlider)d;
-      if( (rangeSlider == null) || !rangeSlider.IsLoaded )
-        return basevalue;
-
-      var min = Math.Min( rangeSlider.Minimum, rangeSlider.Maximum );
-      var max = Math.Max( rangeSlider.Minimum, rangeSlider.Maximum );
-      var lowerValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, (double)basevalue ) );
-      lowerValue = Math.Min( (double)basevalue, rangeSlider.HigherValue );
-
-      return lowerValue;
-    }
-
-    private static void OnLowerValueChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnLowerValueChanged( (double)args.OldValue, (double)args.NewValue );
-      }
-    }
-
-    protected virtual void OnLowerValueChanged( double oldValue, double newValue )
-    {
-      this.AdjustView();
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = RangeSlider.LowerValueChangedEvent;
-      this.RaiseEvent( args );
-    }
-
-    #endregion LowerValue
-
-    #region Maximum
-    /// <summary>
-    /// Maximum property represents the maximum value, which can be selected, in a range.
-    /// </summary>
-    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register( "Maximum", typeof( double ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( RangeSlider.OnMaximumChanged ) );
-
-    public double Maximum
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.MaximumProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.MaximumProperty, value );
-      }
-    }
-
-    private static void OnMaximumChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnMaximumChanged( (double)args.OldValue, (double)args.NewValue );
-      }
-    }
-
-    protected virtual void OnMaximumChanged( double oldValue, double newValue )
-    {
-      this.AdjustView();
-    }
-
-    #endregion Maximum
-
-    #region Minimum
-    /// <summary>
-    /// Minimum property represents the minimum value, which can be selected, in a range.
-    /// </summary>
-    public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register( "Minimum", typeof( double ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( RangeSlider.OnMinimumChanged ) );
-
-    public double Minimum
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.MinimumProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.MinimumProperty, value );
-      }
-    }
-
-    private static void OnMinimumChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnMinimumChanged( (double)args.OldValue, (double)args.NewValue );
-      }
-    }
-
-    protected virtual void OnMinimumChanged( double oldValue, double newValue )
-    {
-      // adjust the range width
-      this.AdjustView();
-    }
-
-    #endregion Minimum
-
-    #region Orientation
-
-    /// <summary>
-    /// Get/Set the RangeSlider's orientation.
-    /// </summary>
-    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register( "Orientation", typeof( Orientation ), typeof( RangeSlider ),
-        new FrameworkPropertyMetadata( Orientation.Horizontal, RangeSlider.OnOrientationChanged ) );
-
-    public Orientation Orientation
-    {
-      get
-      {
-        return (Orientation)GetValue( RangeSlider.OrientationProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.OrientationProperty, value );
-      }
-    }
-
-    private static void OnOrientationChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnOrientationChanged( (Orientation)e.OldValue, (Orientation)e.NewValue );
-      }
-    }
-
-    protected virtual void OnOrientationChanged( Orientation oldValue, Orientation newValue )
-    {
-    }
-
-    #endregion //Orientation
-
-    #region RangeBackground
-    /// <summary>
-    /// Get/Set the Brush for the Range between Lower and Higher values [active state]. (Brush)
-    /// </summary>
-
-    public static readonly DependencyProperty RangeBackgroundProperty = DependencyProperty.Register( "RangeBackground", typeof( Brush ), typeof( RangeSlider ) );
-
-    public Brush RangeBackground
-    {
-      get
-      {
-        return (Brush)GetValue( RangeSlider.RangeBackgroundProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.RangeBackgroundProperty, value );
-      }
-    }
-
-    #endregion RangeBackground
-
-    #region RangeStyle
-    /// <summary>
-    /// Get/Set the Style for the Range between Lower and Higher values. (Style)
-    /// </summary>
-
-    public static readonly DependencyProperty RangeStyleProperty = DependencyProperty.Register( "RangeStyle", typeof( Style ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( null ) );
-
-    public Style RangeStyle
-    {
-      get
-      {
-        return (Style)this.GetValue( RangeSlider.RangeStyleProperty );
-      }
-      set
-      {
-        this.SetValue( RangeSlider.RangeStyleProperty, value );
-      }
-    }
-
-    #endregion RangeStyle
-
-    #region RangeWidth
-    /// <summary>
-    /// RangeWidth property is a readonly property, used to calculate the percentage of the range within the entire min/max range.
-    /// </summary>
-
-    private static readonly DependencyPropertyKey RangeWidthPropertyKey = DependencyProperty.RegisterAttachedReadOnly( "RangeWidth", typeof( double )
-      , typeof( RangeSlider ), new PropertyMetadata( 0d ) );
-
-    public static readonly DependencyProperty RangeWidthProperty = RangeWidthPropertyKey.DependencyProperty;
-
-    public double RangeWidth
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.RangeWidthProperty );
-      }
-      private set
-      {
-        SetValue( RangeSlider.RangeWidthPropertyKey, value );
-      }
-    }
-
-    #endregion RangeWidth
-
-    #region Step
-    /// <summary>
-    /// Step property is used to identify the RangeSlider's size of individual move, when clicking on the LowerRange, HigherRange, not while scrolling the thumbs.
-    /// </summary>
-    private static readonly DependencyProperty StepProperty = DependencyProperty.Register( "Step", typeof( double ), typeof( RangeSlider )
-      , new PropertyMetadata( 1.0, null, RangeSlider.CoerceStep ) );
-
-    public double Step
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.StepProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.StepProperty, value );
-      }
-    }
-
-    private static object CoerceStep( DependencyObject sender, object value )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      double newValue = (double)value;
-
-      return Math.Max( 0.01, newValue );
-    }
-
-    #endregion
-
-    #region TickFrequency
-    /// <summary>       
-    /// Gets or sets the interval between tick marks.
-    /// </summary>
-    public static readonly DependencyProperty TickFrequencyProperty = DependencyProperty.Register( "TickFrequency", typeof( double ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( 1d, RangeSlider.OnTickFrequencyChanged ) );
-
-    public double TickFrequency
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.TickFrequencyProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.TickFrequencyProperty, value );
-      }
-    }
-
-    private static void OnTickFrequencyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      var rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnTickFrequencyChanged( (double)args.OldValue, (double)args.NewValue );
-      }
-    }
-
-    protected virtual void OnTickFrequencyChanged( double oldValue, double newValue )
-    {
-    }
-
-    #endregion TickFrequency
-
-    #region TickPlacement
-
-    public static readonly DependencyProperty TickPlacementProperty = DependencyProperty.Register( "TickPlacement", typeof( TickPlacement ), typeof( RangeSlider ),
-        new FrameworkPropertyMetadata( TickPlacement.None, RangeSlider.OnTickPlacementChanged ) );
-
-    public TickPlacement TickPlacement
-    {
-      get
-      {
-        return (TickPlacement)GetValue( RangeSlider.TickPlacementProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.TickPlacementProperty, value );
-      }
-    }
-
-    private static void OnTickPlacementChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnTickPlacementChanged( (TickPlacement)e.OldValue, (TickPlacement)e.NewValue );
-      }
-    }
-
-    protected virtual void OnTickPlacementChanged( TickPlacement oldValue, TickPlacement newValue )
-    {
-    }
-
-    #endregion //TickPlacement
-
-    #endregion Properties
-
-    #region Override
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _lowerRange != null )
-      {
-        _lowerRange.Click -= new RoutedEventHandler( this.LowerRange_Click );
-      }
-      _lowerRange = this.Template.FindName( PART_LowerRange, this ) as RepeatButton;
-      if( _lowerRange != null )
-      {
-        _lowerRange.Click += new RoutedEventHandler( this.LowerRange_Click );
-      }
-
-      if( _higherRange != null )
-      {
-        _higherRange.Click -= new RoutedEventHandler( this.HigherRange_Click );
-      }
-      _higherRange = this.Template.FindName( PART_HigherRange, this ) as RepeatButton;
-      if( _higherRange != null )
-      {
-        _higherRange.Click += new RoutedEventHandler( this.HigherRange_Click );
-      }
-
-      if( _lowerSlider != null )
-      {
-        _lowerSlider.Loaded -= this.Slider_Loaded;
-        _lowerSlider.ValueChanged -= LowerSlider_ValueChanged;
-        if( _lowerTrack != null )
-        {
-          _lowerTrack.Thumb.DragCompleted -= this.LowerSlider_DragCompleted;
-        }
-      }
-      _lowerSlider = this.Template.FindName( PART_LowerSlider, this ) as Slider;
-      if( _lowerSlider != null )
-      {
-        _lowerSlider.Loaded += this.Slider_Loaded;
-        _lowerSlider.ValueChanged += LowerSlider_ValueChanged;
-        _lowerSlider.ApplyTemplate();
-        _lowerTrack = _lowerSlider.Template.FindName( PART_Track, _lowerSlider ) as Track;
-        if( _lowerTrack != null )
-        {
-          _lowerTrack.Thumb.DragCompleted += this.LowerSlider_DragCompleted;
-        }
-      }
-
-      if( _higherSlider != null )
-      {
-        _higherSlider.Loaded -= this.Slider_Loaded;
-        _higherSlider.ValueChanged -= HigherSlider_ValueChanged;
-        if( _higherTrack != null )
-        {
-          _higherTrack.Thumb.DragCompleted -= this.HigherSlider_DragCompleted;
-        }
-      }
-      _higherSlider = this.Template.FindName( PART_HigherSlider, this ) as Slider;
-      if( _higherSlider != null )
-      {
-        _higherSlider.Loaded += this.Slider_Loaded;
-        _higherSlider.ValueChanged += HigherSlider_ValueChanged;
-        _higherSlider.ApplyTemplate();
-        _higherTrack = _higherSlider.Template.FindName( PART_Track, _higherSlider ) as Track;
-        if( _higherTrack != null )
-        {
-          _higherTrack.Thumb.DragCompleted += this.HigherSlider_DragCompleted;
-        }
-      }
-    }
-
-    public override string ToString()
-    {
-      return this.LowerValue.ToString() + "-" + this.HigherValue.ToString();
-    }
-
-
-    #endregion Override
-
-    #region Methods
-
-    internal static double GetThumbWidth( Slider slider )
-    {
-      if( slider != null )
-      {
-        var track = (Track)slider.Template.FindName( "PART_Track", slider );
-        if( track != null )
-        {
-          var thumb = track.Thumb;
-          return thumb.ActualWidth;
-        }
-      }
-      return 0d;
-    }
-
-    internal static double GetThumbHeight( Slider slider )
-    {
-      if( slider != null )
-      {
-        var track = (Track)slider.Template.FindName( "PART_Track", slider );
-        if( track != null )
-        {
-          var thumb = track.Thumb;
-          return thumb.ActualHeight;
-        }
-      }
-      return 0d;
-    }
-
-    private void AdjustView()
-    {
-      //Coerce values to make them consistent.
-      var cv = this.GetCoercedValues();
-
-      double actualWidth = 0;
-      double lowerSliderThumbWidth = 0d;
-      double higherSliderThumbWidth = 0d;
-
-      if( this.Orientation == Orientation.Horizontal )
-      {
-        actualWidth = this.ActualWidth;
-        lowerSliderThumbWidth = RangeSlider.GetThumbWidth( _lowerSlider );
-        higherSliderThumbWidth = RangeSlider.GetThumbWidth( _higherSlider );
-      }
-      else if( this.Orientation == Orientation.Vertical )
-      {
-        actualWidth = this.ActualHeight;
-        lowerSliderThumbWidth = RangeSlider.GetThumbHeight( _lowerSlider );
-        higherSliderThumbWidth = RangeSlider.GetThumbHeight( _higherSlider );
-      }
-
-      actualWidth -= (lowerSliderThumbWidth + higherSliderThumbWidth);
-
-      this.SetLowerSliderValues( cv.LowerValue, cv.Minimum, cv.Maximum );
-      this.SetHigherSliderValues( cv.HigherValue, cv.Minimum, cv.Maximum );
-
-      double entireRange = cv.Maximum - cv.Minimum;
-
-      if( entireRange > 0 )
-      {
-        this.HigherRangeWidth = (actualWidth * (cv.Maximum - cv.HigherValue)) / entireRange;
-
-        this.RangeWidth = (actualWidth * (cv.HigherValue - cv.LowerValue)) / entireRange;
-
-        this.LowerRangeWidth = (actualWidth * (cv.LowerValue - cv.Minimum)) / entireRange;
-      }
-      else
-      {
-        this.HigherRangeWidth = 0d;
-        this.RangeWidth = 0d;
-        this.LowerRangeWidth = actualWidth;
-      }
-    }
-
-    private void SetSlidersMargins()
-    {
-      if( (_lowerSlider != null) && (_higherSlider != null) )
-      {
-        if( this.Orientation == Orientation.Horizontal )
-        {
-          double lowerSliderThumbWidth = RangeSlider.GetThumbWidth( _lowerSlider );
-          double higherSliderThumbWidth = RangeSlider.GetThumbWidth( _higherSlider );
-
-          _higherSlider.Margin = new Thickness( lowerSliderThumbWidth, 0d, 0d, 0d );
-          _lowerSlider.Margin = new Thickness( 0d, 0d, higherSliderThumbWidth, 0d );
-        }
-        else
-        {
-          double lowerSliderThumbHeight = RangeSlider.GetThumbHeight( _lowerSlider );
-          double higherSliderThumbHeight = RangeSlider.GetThumbHeight( _higherSlider );
-
-          _higherSlider.Margin = new Thickness( 0d, 0d, 0d, lowerSliderThumbHeight );
-          _lowerSlider.Margin = new Thickness( 0d, higherSliderThumbHeight, 0d, 0d );
-        }
-      }
-    }
-
-    private CoercedValues GetCoercedValues()
-    {
-      CoercedValues cv = new CoercedValues();
-      cv.Minimum = Math.Min( this.Minimum, this.Maximum );
-      cv.Maximum = Math.Max( cv.Minimum, this.Maximum );
-      cv.LowerValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, this.LowerValue ) );
-      cv.HigherValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, this.HigherValue ) );
-      cv.HigherValue = Math.Max( cv.LowerValue, cv.HigherValue );
-
-      return cv;
-    }
-
-    private void SetLowerSliderValues( double value, double? minimum, double? maximum )
-    {
-      this.SetSliderValues( _lowerSlider, this.LowerSlider_ValueChanged, value, minimum, maximum );
-    }
-
-    private void SetHigherSliderValues( double value, double? minimum, double? maximum )
-    {
-      this.SetSliderValues( _higherSlider, this.HigherSlider_ValueChanged, value, minimum, maximum );
-    }
-
-    private void SetSliderValues(
-      Slider slider,
-      RoutedPropertyChangedEventHandler<double> handler,
-      double value,
-      double? minimum,
-      double? maximum )
-    {
-      if( slider != null )
-      {
-        slider.ValueChanged -= handler;
-
-        slider.Value = value;
-        if( minimum != null )
-        {
-          slider.Minimum = minimum.Value;
-        }
-        if( maximum != null )
-        {
-          slider.Maximum = maximum.Value;
-        }
-
-        slider.ValueChanged += handler;
-      }
-    }
-
-    private void UpdateHigherValue( double value )
-    {
-      CoercedValues cv = this.GetCoercedValues();
-      double newValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, value ) );
-      newValue = Math.Max( newValue, cv.LowerValue );
-      this.SetHigherSliderValues( newValue, null, null );
-      this.HigherValue = newValue;
-    }
-
-    private void UpdateLowerValue( double value )
-    {
-      CoercedValues cv = this.GetCoercedValues();
-      double newValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, value ) );
-      newValue = Math.Min( newValue, cv.HigherValue );
-      this.SetLowerSliderValues( newValue, null, null );
-      this.LowerValue = newValue;
-    }
-
-    #endregion
-
-    #region Events
-
-    public static readonly RoutedEvent LowerValueChangedEvent = EventManager.RegisterRoutedEvent( "LowerValueChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( RangeSlider ) );
-    public event RoutedEventHandler LowerValueChanged
-    {
-      add
-      {
-        AddHandler( RangeSlider.LowerValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( RangeSlider.LowerValueChangedEvent, value );
-      }
-    }
-
-    public static readonly RoutedEvent HigherValueChangedEvent = EventManager.RegisterRoutedEvent( "HigherValueChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( RangeSlider ) );
-    public event RoutedEventHandler HigherValueChanged
-    {
-      add
-      {
-        AddHandler( RangeSlider.HigherValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( RangeSlider.HigherValueChangedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Events Handlers
-
-    private void LowerRange_Click( object sender, RoutedEventArgs e )
-    {
-      CoercedValues cv = this.GetCoercedValues();
-      //When Maximum is not greater than Minimum, the
-      //slider display is in an inconsistant state. Don't 
-      //consider any operation from the user
-      if( cv.Minimum < cv.Maximum )
-      {
-        double newValue = cv.LowerValue - this.Step;
-        this.LowerValue = Math.Min( cv.Maximum, Math.Max( cv.Minimum, newValue ) );
-      }
-    }
-
-    private void HigherRange_Click( object sender, RoutedEventArgs e )
-    {
-      CoercedValues cv = this.GetCoercedValues();
-      //When Maximum is not greater than Minimum, the
-      //slider display is in an inconsistant state. Don't 
-      //consider any operation from the user
-      if( cv.Minimum < cv.Maximum )
-      {
-        double newValue = cv.HigherValue + this.Step;
-        this.HigherValue = Math.Min( cv.Maximum, Math.Max( cv.Minimum, newValue ) );
-      }
-    }
-
-    private void RangeSlider_SizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      this.AdjustView();
-    }
-
-    private void Slider_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.SetSlidersMargins();
-      this.AdjustView();
-    }
-
-    private void LowerSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
-    {
-      if( (_lowerSlider != null) && _lowerSlider.IsLoaded )
-      {
-        if( !this.IsDeferredUpdateValues )
-        {
-          this.UpdateLowerValue( e.NewValue );
-        }
-        else
-        {
-          _deferredUpdateValue = e.NewValue;
-        }
-      }
-    }
-
-    private void HigherSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
-    {
-      if( ( _higherSlider != null) && _higherSlider.IsLoaded )
-      {
-        if( !this.IsDeferredUpdateValues )
-        {
-          this.UpdateHigherValue( e.NewValue );
-        }
-        else
-        {
-          _deferredUpdateValue = e.NewValue;
-        }
-      }
-    }
-
-    private void HigherSlider_DragCompleted( object sender, DragCompletedEventArgs e )
-    {
-      if( this.IsDeferredUpdateValues )
-      {
-        this.UpdateHigherValue( _deferredUpdateValue );
-      }
-    }
-
-    private void LowerSlider_DragCompleted( object sender, DragCompletedEventArgs e )
-    {
-      if( this.IsDeferredUpdateValues )
-      {
-        this.UpdateLowerValue( _deferredUpdateValue );
-      }
-    }
-
-    #endregion Events Handlers
-
-    private struct CoercedValues
-    {
-      public double Minimum;
-      public double Maximum;
-      public double LowerValue;
-      public double HigherValue;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index f4890a1f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,570 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
-                    xmlns:coreConv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <coreConv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-
-  <!-- Repeat Button - This is used by the RangeSlider for the LowerRange, Range, and HigherRange buttons -->
-  <Style x:Key="DefaultRangeStyle"
-         TargetType="{x:Type RepeatButton}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Grid>
-            <Rectangle x:Name="MainBorder"
-                       Fill="{TemplateBinding Background}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- Since a thumb is pretty small, we put a bigger visual clue
-        outside the thumb bounds to give the user a hint where the focus is -->
-  <Style x:Key="ThumbFocusVisualStyle">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Margin="-2"
-                     StrokeThickness="1"
-                     Stroke="Black"
-                     StrokeDashArray="1 2" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- ********************** -->
-  <!-- Thumb Template    -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="ThumbTemplate"
-                   TargetType="{x:Type Thumb}">
-    <Grid>
-      <Rectangle x:Name="BackgroundFadingRect"
-                 Fill="Black"
-                 Width="11"
-                 Height="20"
-                 SnapsToDevicePixels="True" />
-      <Rectangle x:Name="MainBorder"
-                 Fill="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background, TargetNullValue=#FFF0F0F0}"
-                 StrokeThickness="1"
-                 Stroke="#FFACACAC"
-                 Opacity="1"
-                 Width="11"
-                 Height="20"
-                 SnapsToDevicePixels="True" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                   Value="Transparent">
-        <Setter Property="Visibility"
-                TargetName="BackgroundFadingRect"
-                Value="Collapsed" />
-      </DataTrigger>
-      <Trigger Property="IsMouseOver"
-               Value="True">
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="0.75" />
-      </Trigger>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background}"
-                     Value="{x:Null}" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="1" />
-        <Setter Property="Stroke"
-                TargetName="MainBorder"
-                Value="#FF7EB4EA" />
-        <Setter Property="Fill"
-                TargetName="MainBorder"
-                Value="#FFDCECFC" />
-      </MultiDataTrigger>
-
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="1" />
-        <Setter Property="Stroke"
-                TargetName="MainBorder"
-                Value="#FFD9D9D9" />
-        <Setter Property="Fill"
-                TargetName="MainBorder"
-                Value="#FFF0F0F0" />
-      </Trigger>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Slider}}, Path=Orientation}"
-                   Value="Vertical">
-        <Setter TargetName="MainBorder"
-                Property="Width"
-                Value="20" />
-        <Setter TargetName="MainBorder"
-                Property="Height"
-                Value="11" />
-        <Setter TargetName="BackgroundFadingRect"
-                Property="Width"
-                Value="20" />
-        <Setter TargetName="BackgroundFadingRect"
-                Property="Height"
-                Value="11" />
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- Slider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="SliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <Border SnapsToDevicePixels="True"
-            BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="{TemplateBinding BorderThickness}">
-      <Track x:Name="PART_Track"
-             Orientation="{TemplateBinding Orientation}">
-        <Track.Thumb>
-          <Thumb x:Name="Thumb"
-                 Focusable="True"
-                 FocusVisualStyle="{StaticResource ThumbFocusVisualStyle}"
-                 Background="{TemplateBinding Background}"
-                 Template="{StaticResource ThumbTemplate}">
-          </Thumb>
-        </Track.Thumb>
-      </Track>
-    </Border>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- HorizontalTickSlider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="HorizontalTickSliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <TickBar Name="TopTick"
-               Grid.Row="0"
-               SnapsToDevicePixels="True"
-               Placement="Top"
-               Fill="Black"
-               Height="4"
-               Visibility="Collapsed" />
-
-      <Border Grid.Row="1"
-              SnapsToDevicePixels="true"
-              Visibility="Hidden">
-        <Track x:Name="PART_Track"
-               Orientation="{TemplateBinding Orientation}">
-          <Track.Thumb>
-            <Thumb x:Name="Thumb"
-                   Focusable="True"
-                   Template="{StaticResource ThumbTemplate}">
-            </Thumb>
-          </Track.Thumb>
-        </Track>
-      </Border>
-
-      <TickBar Name="BottomTick"
-               Grid.Row="2"
-               SnapsToDevicePixels="True"
-               Fill="Black"
-               Placement="Bottom"
-               Height="4"
-               Visibility="Collapsed" />
-    </Grid>
-
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="TopLeft">
-        <Setter TargetName="TopTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="BottomRight">
-        <Setter TargetName="BottomTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="Both">
-        <Setter TargetName="TopTick"
-                Property="Visibility"
-                Value="Visible" />
-        <Setter TargetName="BottomTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- VerticalTickSlider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="VerticalTickSliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-
-      <TickBar Name="LeftTick"
-               Grid.Column="0"
-               SnapsToDevicePixels="True"
-               Placement="Left"
-               Fill="Black"
-               Width="4"
-               Visibility="Collapsed" />
-
-      <Border Grid.Column="1"
-              SnapsToDevicePixels="true"
-              Visibility="Hidden">
-        <Track x:Name="PART_Track"
-               Orientation="{TemplateBinding Orientation}">
-          <Track.Thumb>
-            <Thumb x:Name="Thumb"
-                   Focusable="True"
-                   Template="{StaticResource ThumbTemplate}">
-            </Thumb>
-          </Track.Thumb>
-        </Track>
-      </Border>
-
-      <TickBar Name="RightTick"
-               Grid.Column="2"
-               SnapsToDevicePixels="True"
-               Fill="Black"
-               Placement="Right"
-               Width="4"
-               Visibility="Collapsed" />
-    </Grid>
-
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="TopLeft">
-        <Setter TargetName="LeftTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="BottomRight">
-        <Setter TargetName="RightTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="Both">
-        <Setter TargetName="LeftTick"
-                Property="Visibility"
-                Value="Visible" />
-        <Setter TargetName="RightTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- Vertical RangeSlider Template -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="VerticalRangeSlider"
-                   TargetType="{x:Type local:RangeSlider}">
-    <Border BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="{TemplateBinding BorderThickness}"
-            Background="{TemplateBinding Background}">
-      <Grid HorizontalAlignment="Left"
-            VerticalAlignment="Top">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition x:Name="LeftColumn"
-                            Width="0" />
-          <ColumnDefinition Width="Auto" />
-          <ColumnDefinition x:Name="RightColumn"
-                            Width="0" />
-        </Grid.ColumnDefinitions>
-        <!-- Get the Thumbs's height to set a good height for the RangeSlider.-->
-        <Grid.RowDefinitions>
-          <RowDefinition Height="11" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="11" />
-        </Grid.RowDefinitions>
-
-        <Border Grid.Row="1"
-                Grid.RowSpan="3"
-                Grid.Column="1"
-                BorderThickness="1"
-                BorderBrush="#FFD6D6D6"
-                Background="#FFE7EAEA"
-                VerticalAlignment="Stretch"
-                HorizontalAlignment="Center"
-                Width="4" />
-
-        <!-- Create a Hidden Slider to only display its Ticks -->
-        <Slider x:Name="TickSlider"
-                Orientation="Vertical"
-                Grid.RowSpan="5"
-                Grid.ColumnSpan="3"
-                Focusable="False"
-                Margin="0,5.5,0,5.5"
-                Template="{StaticResource VerticalTickSliderTemplate}"
-                Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
-                Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
-                TickFrequency="{TemplateBinding TickFrequency}">
-        </Slider>
-
-        <RepeatButton x:Name="PART_LowerRange"
-                      Height="{TemplateBinding LowerRangeWidth}"
-                      Grid.Row="3"
-                      Grid.Column="1"
-                      Background="{TemplateBinding LowerRangeBackground}"
-                      Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <RepeatButton Height="{TemplateBinding RangeWidth}"
-                      Grid.Row="2"
-                      Grid.Column="1"
-                      Background="{TemplateBinding RangeBackground}"
-                      Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <RepeatButton x:Name="PART_HigherRange"
-                      Height="{TemplateBinding HigherRangeWidth}"
-                      Grid.Row="1"
-                      Grid.Column="1"
-                      Background="{TemplateBinding HigherRangeBackground}"
-                      Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb Height -->
-        <Slider x:Name="PART_LowerSlider"
-                Orientation="Vertical"
-                Grid.RowSpan="5"
-                Grid.Column="1"
-                Focusable="False"
-                Background="{TemplateBinding LowerThumbBackground}"
-                Template="{StaticResource SliderTemplate}"
-                IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                TickFrequency="{TemplateBinding TickFrequency}"
-                HorizontalAlignment="Left"
-                AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
-        </Slider>
-
-        <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
-        <Slider x:Name="PART_HigherSlider"
-                Grid.RowSpan="5"
-                Grid.Column="1"
-                Orientation="Vertical"
-                Focusable="False"
-                Background="{TemplateBinding HigherThumbBackground}"
-                Template="{StaticResource SliderTemplate}"
-                IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                TickFrequency="{TemplateBinding TickFrequency}"
-                HorizontalAlignment="Left"
-                AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
-        </Slider>
-      </Grid>
-    </Border>
-    <ControlTemplate.Triggers>
-      <Trigger Property="TickPlacement"
-               Value="TopLeft">
-        <Setter TargetName="LeftColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-      <Trigger Property="TickPlacement"
-               Value="BottomRight">
-        <Setter TargetName="RightColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-      <Trigger Property="TickPlacement"
-               Value="Both">
-        <Setter TargetName="LeftColumn"
-                Property="Width"
-                Value="4" />
-        <Setter TargetName="RightColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- RangeSlider Style -->
-  <!-- ********************** -->
-  <Style TargetType="{x:Type local:RangeSlider}">
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:RangeSlider}">
-          <Border BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Background="{TemplateBinding Background}">
-            <Grid HorizontalAlignment="Left"
-                  VerticalAlignment="Top">
-              <Grid.RowDefinitions>
-                <RowDefinition x:Name="TopRow"
-                               Height="0" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition x:Name="BottomRow"
-                               Height="0" />
-              </Grid.RowDefinitions>
-              <!-- Get the Thumbs's width to set a good width for the RangeSlider. -->
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="11" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="11" />
-              </Grid.ColumnDefinitions>
-
-              <Border Grid.Column="1"
-                      Grid.ColumnSpan="3"
-                      Grid.Row="1"
-                      BorderThickness="1"
-                      BorderBrush="#FFD6D6D6"
-                      Background="#FFE7EAEA"
-                      VerticalAlignment="Center"
-                      Height="4" />
-
-              <!-- Create a Hidden Slider to only display its Ticks -->
-              <Slider x:Name="TickSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.RowSpan="3"
-                      Focusable="False"
-                      Margin="5.5,0,5.5,0"
-                      Template="{StaticResource HorizontalTickSliderTemplate}"
-                      Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
-                      Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
-                      TickFrequency="{TemplateBinding TickFrequency}">
-              </Slider>
-
-              <RepeatButton x:Name="PART_LowerRange"
-                            Width="{TemplateBinding LowerRangeWidth}"
-                            Grid.Column="1"
-                            Grid.Row="1"
-                            Background="{TemplateBinding LowerRangeBackground}"
-                            Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True">
-              </RepeatButton>
-
-              <RepeatButton Width="{TemplateBinding RangeWidth}"
-                            Grid.Column="2"
-                            Grid.Row="1"
-                            Background="{TemplateBinding RangeBackground}"
-                            Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True">
-              </RepeatButton>
-
-              <RepeatButton x:Name="PART_HigherRange"
-                            Width="{TemplateBinding HigherRangeWidth}"
-                            Grid.Column="3"
-                            Grid.Row="1"
-                            Background="{TemplateBinding HigherRangeBackground}"
-                            Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True">
-              </RepeatButton>
-
-              <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb width -->
-              <Slider x:Name="PART_LowerSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.Row="1"
-                      Focusable="False"
-                      Background="{TemplateBinding LowerThumbBackground}"
-                      Template="{StaticResource SliderTemplate}"
-                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                      TickFrequency="{TemplateBinding TickFrequency}"
-                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
-              </Slider>
-
-              <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
-              <Slider x:Name="PART_HigherSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.Row="1"
-                      Focusable="False"
-                      Background="{TemplateBinding HigherThumbBackground}"
-                      Template="{StaticResource SliderTemplate}"
-                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                      TickFrequency="{TemplateBinding TickFrequency}"
-                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
-              </Slider>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="TickPlacement"
-                     Value="TopLeft">
-              <Setter TargetName="TopRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-            <Trigger Property="TickPlacement"
-                     Value="BottomRight">
-              <Setter TargetName="BottomRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-            <Trigger Property="TickPlacement"
-                     Value="Both">
-              <Setter TargetName="TopRow"
-                      Property="Height"
-                      Value="4" />
-              <Setter TargetName="BottomRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="Orientation"
-               Value="Vertical">
-        <Setter Property="Template"
-                Value="{StaticResource VerticalRangeSlider}" />
-      </Trigger>
-    </Style.Triggers>
-
-
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
deleted file mode 100644
index 95a47482..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
+++ /dev/null
@@ -1,636 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
-                    xmlns:coreConv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <coreConv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-
-  <LinearGradientBrush x:Key="NormalThumbFillBackground"
-                       StartPoint="0.5,0"
-                       EndPoint="0.5,1">
-    <GradientStop Color="White"
-                  Offset="0" />
-    <GradientStop Color="#FFEBEBEB"
-                  Offset="0.5" />
-    <GradientStop Color="#FFD6D6D6"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="MouseOverThumbFillBackground"
-                       StartPoint="0.5,0"
-                       EndPoint="0.5,1">
-    <GradientStop Color="White"
-                  Offset="0" />
-    <GradientStop Color="#FFBBE3F9"
-                  Offset="0.5" />
-    <GradientStop Color="#FFB1E0F8"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PressedThumbFillBackground"
-                       StartPoint="0.5,0"
-                       EndPoint="0.5,1">
-    <GradientStop Color="White"
-                  Offset="0" />
-    <GradientStop Color="#FF5DB2E0"
-                  Offset="0.5" />
-    <GradientStop Color="#FF4F93BD"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="SliderBorderBrush"
-                       StartPoint="0.5,0"
-                       EndPoint="0.5,1">
-    <GradientStop Color="#FFB2B5B3"
-                  Offset="0" />
-    <GradientStop Color="#FFFAFAFA"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="SliderVerticalBorderBrush"
-                       StartPoint="0,0.5"
-                       EndPoint="1,0.5">
-    <GradientStop Color="#FFB2B5B3"
-                  Offset="0" />
-    <GradientStop Color="#FFFAFAFA"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <!-- Repeat Button - This is used by RangeSlider for the LowerRange, Range, and HigherRange buttons -->
-  <Style x:Key="DefaultRangeStyle"
-         TargetType="{x:Type RepeatButton}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Grid>
-            <Rectangle x:Name="MainBorder"
-                       Fill="{TemplateBinding Background}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- Since a thumb is pretty small, we put a bigger visual clue
-        outside the thumb bounds to give the user a hint where the focus is -->
-  <Style x:Key="ThumbFocusVisualStyle">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Margin="-2"
-                     StrokeThickness="1"
-                     Stroke="Black"
-                     StrokeDashArray="1 2" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- ********************** -->
-  <!-- Thumb Template    -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="ThumbTemplate"
-                   TargetType="{x:Type Thumb}">
-    <Grid>
-      <Border x:Name="BackgroundFadingBorder"
-              Background="Black" />
-      <Border x:Name="BackgroundBorder"
-              BorderBrush="#FF929292"
-              BorderThickness="1"
-              CornerRadius="1">
-        <Rectangle x:Name="MainBorder"
-                   Fill="{Binding Background, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource NormalThumbFillBackground}}"
-                   StrokeThickness="1"
-                   Stroke="White"
-                   Width="9"
-                   Height="20"
-                   Opacity="1"
-                   SnapsToDevicePixels="True" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver"
-               Value="True">
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="0.9" />
-      </Trigger>
-      <Trigger Property="IsMouseCaptureWithin"
-               Value="True">
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="0.8" />
-      </Trigger>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Slider}}, Path=Orientation}"
-                   Value="Vertical">
-        <Setter TargetName="MainBorder"
-                Property="Width"
-                Value="20" />
-        <Setter TargetName="MainBorder"
-                Property="Height"
-                Value="9" />
-      </DataTrigger>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background}"
-                     Value="{x:Null}" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="1" />
-        <Setter Property="BorderBrush"
-                TargetName="BackgroundBorder"
-                Value="#FF3C7FB1" />
-        <Setter Property="Fill"
-                TargetName="MainBorder"
-                Value="{StaticResource MouseOverThumbFillBackground}" />
-      </MultiDataTrigger>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background}"
-                     Value="{x:Null}" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseCaptureWithin}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                TargetName="BackgroundBorder"
-                Value="#FF2C628B" />
-        <Setter Property="Fill"
-                TargetName="MainBorder"
-                Value="{StaticResource PressedThumbFillBackground}" />
-      </MultiDataTrigger>
-
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="BorderBrush"
-                TargetName="BackgroundBorder"
-                Value="#FFD7D7D7" />
-        <Setter Property="Fill"
-                TargetName="MainBorder"
-                Value="#FFF4F4F4" />
-        <Setter Property="Stroke"
-                TargetName="MainBorder"
-                Value="#FFD7D7D7" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- Slider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="SliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <!--<Border SnapsToDevicePixels="true"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">-->
-    <Track x:Name="PART_Track"
-           Orientation="{TemplateBinding Orientation}">
-      <Track.Thumb>
-        <Thumb x:Name="thumb"
-               Focusable="True"
-               FocusVisualStyle="{StaticResource ThumbFocusVisualStyle}"
-               Background="{TemplateBinding Background}"
-               Template="{StaticResource ThumbTemplate}">
-        </Thumb>
-      </Track.Thumb>
-    </Track>
-    <!--</Border>-->
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- HorizontalTickSlider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="HorizontalTickSliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <TickBar Name="TopTick"
-               Grid.Row="0"
-               SnapsToDevicePixels="True"
-               Placement="Top"
-               Fill="Black"
-               Height="4"
-               Visibility="Collapsed" />
-
-      <Border Grid.Row="1"
-              SnapsToDevicePixels="true"
-              Visibility="Hidden">
-        <Track x:Name="PART_Track"
-               Orientation="{TemplateBinding Orientation}">
-          <Track.Thumb>
-            <Thumb x:Name="Thumb"
-                   Focusable="True"
-                   Template="{StaticResource ThumbTemplate}">
-            </Thumb>
-          </Track.Thumb>
-        </Track>
-      </Border>
-
-      <TickBar Name="BottomTick"
-               Grid.Row="2"
-               SnapsToDevicePixels="True"
-               Fill="Black"
-               Placement="Bottom"
-               Height="4"
-               Visibility="Collapsed" />
-    </Grid>
-
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="TopLeft">
-        <Setter TargetName="TopTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="BottomRight">
-        <Setter TargetName="BottomTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="Both">
-        <Setter TargetName="TopTick"
-                Property="Visibility"
-                Value="Visible" />
-        <Setter TargetName="BottomTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- VerticalTickSlider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="VerticalTickSliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-
-      <TickBar Name="LeftTick"
-               Grid.Column="0"
-               SnapsToDevicePixels="True"
-               Placement="Left"
-               Fill="Black"
-               Width="4"
-               Visibility="Collapsed" />
-
-      <Border Grid.Column="1"
-              SnapsToDevicePixels="true"
-              Visibility="Hidden">
-        <Track x:Name="PART_Track"
-               Orientation="{TemplateBinding Orientation}">
-          <Track.Thumb>
-            <Thumb x:Name="Thumb"
-                   Focusable="True"
-                   Template="{StaticResource ThumbTemplate}">
-            </Thumb>
-          </Track.Thumb>
-        </Track>
-      </Border>
-
-      <TickBar Name="RightTick"
-               Grid.Column="2"
-               SnapsToDevicePixels="True"
-               Fill="Black"
-               Placement="Right"
-               Width="4"
-               Visibility="Collapsed" />
-    </Grid>
-
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="TopLeft">
-        <Setter TargetName="LeftTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="BottomRight">
-        <Setter TargetName="RightTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="Both">
-        <Setter TargetName="LeftTick"
-                Property="Visibility"
-                Value="Visible" />
-        <Setter TargetName="RightTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- Vertical RangeSlider Template -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="VerticalRangeSlider"
-                   TargetType="{x:Type local:RangeSlider}">
-    <Border BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="{TemplateBinding BorderThickness}"
-            Background="{TemplateBinding Background}">
-      <Grid HorizontalAlignment="Left"
-            VerticalAlignment="Top">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition x:Name="LeftColumn"
-                            Width="0" />
-          <ColumnDefinition Width="Auto" />
-          <ColumnDefinition x:Name="RightColumn"
-                            Width="0" />
-        </Grid.ColumnDefinitions>
-        <!-- Get the Thumbs's height to set a good height for the RangeSlider. -->
-        <Grid.RowDefinitions>
-          <!-- 11 is equal to the width of the horizontal slider thumb, (or the height of the vertical slider thumb)
-               See Thumb template -->
-          <RowDefinition Height="11" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="11" />
-        </Grid.RowDefinitions>
-
-        <Border Grid.Row="1"
-                Grid.RowSpan="3"
-                Grid.Column="1"
-                BorderThickness="1"
-                BorderBrush="{StaticResource SliderVerticalBorderBrush}"
-                Background="#FFE7EAEA"
-                VerticalAlignment="Stretch"
-                HorizontalAlignment="Center"
-                Width="4" />
-
-        <!-- Create a Hidden Slider to only display its Ticks -->
-        <Slider x:Name="TickSlider"
-                Orientation="Vertical"
-                Grid.RowSpan="5"
-                Grid.ColumnSpan="3"
-                Focusable="False"
-                Margin="0,5.5,0,5.5"
-                Template="{StaticResource VerticalTickSliderTemplate}"
-                Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
-                Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
-                TickFrequency="{TemplateBinding TickFrequency}">
-        </Slider>
-
-        <RepeatButton x:Name="PART_LowerRange"
-                      Height="{TemplateBinding LowerRangeWidth}"
-                      Grid.Row="3"
-                      Grid.Column="1"
-                      Background="{TemplateBinding LowerRangeBackground}"
-                      Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <RepeatButton Height="{TemplateBinding RangeWidth}"
-                      Grid.Row="2"
-                      Grid.Column="1"
-                      Background="{TemplateBinding RangeBackground}"
-                      Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <RepeatButton x:Name="PART_HigherRange"
-                      Height="{TemplateBinding HigherRangeWidth}"
-                      Grid.Row="1"
-                      Grid.Column="1"
-                      Background="{TemplateBinding HigherRangeBackground}"
-                      Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb Height -->
-        <Slider x:Name="PART_LowerSlider"
-                Orientation="Vertical"
-                Grid.RowSpan="5"
-                Grid.Column="1"
-                Focusable="False"
-                Background="{TemplateBinding LowerThumbBackground}"
-                Template="{StaticResource SliderTemplate}"
-                IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                TickFrequency="{TemplateBinding TickFrequency}"
-                HorizontalAlignment="Left"
-                AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}" >
-        </Slider>
-
-        <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
-        <Slider x:Name="PART_HigherSlider"
-                Grid.RowSpan="5"
-                Grid.Column="1"
-                Orientation="Vertical"
-                Focusable="False"
-                Background="{TemplateBinding HigherThumbBackground}"
-                Template="{StaticResource SliderTemplate}"
-                IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                TickFrequency="{TemplateBinding TickFrequency}"
-                HorizontalAlignment="Left"
-                AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}" >
-        </Slider>
-      </Grid>
-    </Border>
-    <ControlTemplate.Triggers>
-      <Trigger Property="TickPlacement"
-               Value="TopLeft">
-        <Setter TargetName="LeftColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-      <Trigger Property="TickPlacement"
-               Value="BottomRight">
-        <Setter TargetName="RightColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-      <Trigger Property="TickPlacement"
-               Value="Both">
-        <Setter TargetName="LeftColumn"
-                Property="Width"
-                Value="4" />
-        <Setter TargetName="RightColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- RangeSlider Style -->
-  <!-- ********************** -->
-  <Style TargetType="{x:Type local:RangeSlider}">
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:RangeSlider}">
-          <Border BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Background="{TemplateBinding Background}">
-            <Grid HorizontalAlignment="Left"
-                  VerticalAlignment="Top">
-
-              <Grid.RowDefinitions>
-                <RowDefinition x:Name="TopRow"
-                               Height="0" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition x:Name="BottomRow"
-                               Height="0" />
-              </Grid.RowDefinitions>
-              <!-- Get the Thumbs's width to set a good width for the RangeSlider. -->
-              <Grid.ColumnDefinitions>
-                <!-- 11 is equal to the width of the horizontal slider thumb, (or the height of the vertical slider thumb)
-                     See Thumb template -->
-                <ColumnDefinition Width="11" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="11" />
-              </Grid.ColumnDefinitions>
-
-              <Border Grid.Column="1"
-                      Grid.ColumnSpan="3"
-                      Grid.Row="1"
-                      BorderThickness="1"
-                      BorderBrush="{StaticResource SliderBorderBrush}"
-                      Background="#FFE7EAEA"
-                      VerticalAlignment="Center"
-                      Height="4" />
-
-              <!-- Create a Hidden Slider to only display its Ticks -->
-              <Slider x:Name="TickSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.RowSpan="3"
-                      Focusable="False"
-                      Margin="5.5,0,5.5,0"
-                      Template="{StaticResource HorizontalTickSliderTemplate}"
-                      Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
-                      Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
-                      TickFrequency="{TemplateBinding TickFrequency}">
-              </Slider>
-
-              <RepeatButton x:Name="PART_LowerRange"
-                            Width="{TemplateBinding LowerRangeWidth}"
-                            Grid.Column="1"
-                            Grid.Row="1"
-                            Background="{TemplateBinding LowerRangeBackground}"
-                            Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True" >
-              </RepeatButton>
-
-              <RepeatButton Width="{TemplateBinding RangeWidth}"
-                            Grid.Column="2"
-                            Grid.Row="1"
-                            Background="{TemplateBinding RangeBackground}"
-                            Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True" >
-              </RepeatButton>
-
-              <RepeatButton x:Name="PART_HigherRange"
-                            Width="{TemplateBinding HigherRangeWidth}"
-                            Grid.Column="3"
-                            Grid.Row="1"
-                            Background="{TemplateBinding HigherRangeBackground}"
-                            Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True" >
-              </RepeatButton>
-
-              <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb width -->
-              <Slider x:Name="PART_LowerSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.Row="1"
-                      Focusable="False"
-                      Background="{TemplateBinding LowerThumbBackground}"
-                      Template="{StaticResource SliderTemplate}"
-                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                      TickFrequency="{TemplateBinding TickFrequency}"
-                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}" >
-              </Slider>
-
-              <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
-              <Slider x:Name="PART_HigherSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.Row="1"
-                      Focusable="False"
-                      Background="{TemplateBinding HigherThumbBackground}"
-                      Template="{StaticResource SliderTemplate}"
-                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                      TickFrequency="{TemplateBinding TickFrequency}"
-                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}" >
-              </Slider>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="TickPlacement"
-                     Value="TopLeft">
-              <Setter TargetName="TopRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-            <Trigger Property="TickPlacement"
-                     Value="BottomRight">
-              <Setter TargetName="BottomRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-            <Trigger Property="TickPlacement"
-                     Value="Both">
-              <Setter TargetName="TopRow"
-                      Property="Height"
-                      Value="4" />
-              <Setter TargetName="BottomRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="Orientation"
-               Value="Vertical">
-        <Setter Property="Template"
-                Value="{StaticResource VerticalRangeSlider}" />
-      </Trigger>
-    </Style.Triggers>
-
-
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
deleted file mode 100644
index ddbdfd46..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public interface ITextFormatter
-  {
-    string GetText( FlowDocument document );
-    void SetText( FlowDocument document, string text );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
deleted file mode 100644
index bb6d1ff3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Formats the RichTextBox text as plain text
-  /// </summary>
-  public class PlainTextFormatter : ITextFormatter
-  {
-    public string GetText( FlowDocument document )
-    {
-      return new TextRange( document.ContentStart, document.ContentEnd ).Text;
-    }
-
-    public void SetText( FlowDocument document, string text )
-    {
-      new TextRange( document.ContentStart, document.ContentEnd ).Text = text;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
deleted file mode 100644
index aaca7b13..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.IO;
-using System.Text;
-using System.Windows;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Formats the RichTextBox text as RTF
-  /// </summary>
-  public class RtfFormatter : ITextFormatter
-  {
-    public string GetText( FlowDocument document )
-    {
-      TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
-      using( MemoryStream ms = new MemoryStream() )
-      {
-        tr.Save( ms, DataFormats.Rtf );
-        return ASCIIEncoding.Default.GetString( ms.ToArray() );
-      }
-    }
-
-    public void SetText( FlowDocument document, string text )
-    {
-      try
-      {
-        //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
-        //to the TextRange.Load method an exception would occur.
-        if( String.IsNullOrEmpty( text ) )
-        {
-          document.Blocks.Clear();
-        }
-        else
-        {
-          TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
-          using( MemoryStream ms = new MemoryStream( Encoding.ASCII.GetBytes( text ) ) )
-          {
-            tr.Load( ms, DataFormats.Rtf );
-          }
-        }
-      }
-      catch
-      {
-        throw new InvalidDataException( "Data provided is not in the correct RTF format." );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
deleted file mode 100644
index 30ed667a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.IO;
-using System.Text;
-using System.Windows;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Formats the RichTextBox text as Xaml
-  /// </summary>
-  public class XamlFormatter : ITextFormatter
-  {
-    public string GetText( System.Windows.Documents.FlowDocument document )
-    {
-      TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
-      using( MemoryStream ms = new MemoryStream() )
-      {
-        tr.Save( ms, DataFormats.Xaml );
-        return ASCIIEncoding.Default.GetString( ms.ToArray() );
-      }
-    }
-
-    public void SetText( System.Windows.Documents.FlowDocument document, string text )
-    {
-      try
-      {
-        //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
-        //to the TextRange.Load method an exception would occur.
-        if( String.IsNullOrEmpty( text ) )
-        {
-          document.Blocks.Clear();
-        }
-        else
-        {
-          TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
-          using( MemoryStream ms = new MemoryStream( Encoding.ASCII.GetBytes( text ) ) )
-          {
-            tr.Load( ms, DataFormats.Xaml );
-          }
-        }
-      }
-      catch
-      {
-        throw new InvalidDataException( "Data provided is not in the correct Xaml format." );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
deleted file mode 100644
index 7bd70583..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class RichTextBox : System.Windows.Controls.RichTextBox
-  {
-    #region Private Members
-
-    private bool _preventDocumentUpdate;
-    private bool _preventTextUpdate;
-
-    #endregion //Private Members
-
-    #region Constructors
-
-    public RichTextBox()
-    {
-    }
-
-    public RichTextBox( System.Windows.Documents.FlowDocument document )
-      : base( document )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( RichTextBox ), new FrameworkPropertyMetadata( String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextPropertyChanged, CoerceTextProperty, true, UpdateSourceTrigger.LostFocus ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( RichTextBox )d ).UpdateDocumentFromText();
-    }
-
-    private static object CoerceTextProperty( DependencyObject d, object value )
-    {
-      return value ?? "";
-    }
-
-    #endregion //Text
-
-    #region TextFormatter
-
-    public static readonly DependencyProperty TextFormatterProperty = DependencyProperty.Register( "TextFormatter", typeof( ITextFormatter ), typeof( RichTextBox ), new FrameworkPropertyMetadata( new RtfFormatter(), OnTextFormatterPropertyChanged ) );
-    public ITextFormatter TextFormatter
-    {
-      get
-      {
-        return ( ITextFormatter )GetValue( TextFormatterProperty );
-      }
-      set
-      {
-        SetValue( TextFormatterProperty, value );
-      }
-    }
-
-    private static void OnTextFormatterPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      RichTextBox richTextBox = d as RichTextBox;
-      if( richTextBox != null )
-        richTextBox.OnTextFormatterPropertyChanged( ( ITextFormatter )e.OldValue, ( ITextFormatter )e.NewValue );
-    }
-
-    protected virtual void OnTextFormatterPropertyChanged( ITextFormatter oldValue, ITextFormatter newValue )
-    {
-      this.UpdateTextFromDocument();
-    }
-
-    #endregion //TextFormatter
-
-    #endregion //Properties
-
-    #region Methods
-
-    protected override void OnTextChanged( System.Windows.Controls.TextChangedEventArgs e )
-    {
-      base.OnTextChanged( e );
-      this.UpdateTextFromDocument();
-    }
-
-    private void UpdateTextFromDocument()
-    {
-      if( _preventTextUpdate )
-        return;
-
-      _preventDocumentUpdate = true;
-#if VS2008
-      Text = this.TextFormatter.GetText( this.Document );
-#else
-      this.SetCurrentValue( RichTextBox.TextProperty, this.TextFormatter.GetText( this.Document ) );
-#endif
-      _preventDocumentUpdate = false;
-    }
-
-    private void UpdateDocumentFromText()
-    {
-      if( _preventDocumentUpdate )
-        return;
-
-      _preventTextUpdate = true;
-      this.TextFormatter.SetText( this.Document, Text );
-      _preventTextUpdate = false;
-    }
-
-    /// <summary>
-    /// Clears the content of the RichTextBox.
-    /// </summary>
-    public void Clear()
-    {
-      this.Document.Blocks.Clear();
-    }
-
-    public override void BeginInit()
-    {
-      base.BeginInit();
-      // Do not update anything while initializing. See EndInit
-      _preventTextUpdate = true;
-      _preventDocumentUpdate = true;
-    }
-
-    public override void EndInit()
-    {
-      base.EndInit();
-      _preventTextUpdate = false;
-      _preventDocumentUpdate = false;
-      // Possible conflict here if the user specifies 
-      // the document AND the text at the same time 
-      // in XAML. Text has priority.
-      if( !string.IsNullOrEmpty( Text ) )
-      {
-        this.UpdateDocumentFromText();
-      }
-      else
-      {
-        this.UpdateTextFromDocument();
-      }
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
deleted file mode 100644
index e8852f65..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  public interface IRichTextBoxFormatBar
-  {
-    /// <summary>
-    /// Represents the RichTextBox that will be the target for all text manipulations in the format bar.
-    /// </summary>
-    System.Windows.Controls.RichTextBox Target
-    {
-      get;
-      set;
-    }
-
-    /// <summary>
-    /// Represents the property that will be used to know if the formatBar should fade when mouse goes away.
-    /// </summary>
-    bool PreventDisplayFadeOut
-    {
-      get;
-    }
-
-    /// <summary>
-    /// Represents the Method that will be used to update the format bar values based on the Selection.
-    /// </summary>
-    void Update();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png
deleted file mode 100644
index 8fb36a1a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png
deleted file mode 100644
index 73e7c15e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png
deleted file mode 100644
index 1030a021..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png
deleted file mode 100644
index d9207308..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png
deleted file mode 100644
index 8259a9e1..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png
deleted file mode 100644
index c5499bce..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png
deleted file mode 100644
index 51dffb73..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png
deleted file mode 100644
index 03f6fde2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png
deleted file mode 100644
index cb8e400a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png
deleted file mode 100644
index 4a3783f2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png
deleted file mode 100644
index 72689482..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
deleted file mode 100644
index 53b19dfa..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
+++ /dev/null
@@ -1,474 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Linq;
-using System.Windows.Controls;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Media;
-using System.Windows.Documents;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class RichTextBoxFormatBar : Control, IRichTextBoxFormatBar
-  {
-    #region Members
-    private ComboBox _cmbFontFamilies;
-    private ComboBox _cmbFontSizes;
-    private ColorPicker _cmbFontBackgroundColor;
-    private ColorPicker _cmbFontColor;
-
-    private ToggleButton _btnNumbers;
-    private ToggleButton _btnBullets;
-    private ToggleButton _btnBold;
-    private ToggleButton _btnItalic;
-    private ToggleButton _btnUnderline;
-    private ToggleButton _btnAlignLeft;
-    private ToggleButton _btnAlignCenter;
-    private ToggleButton _btnAlignRight;
-
-    private Thumb _dragWidget;
-    private bool _waitingForMouseOver;
-    #endregion
-
-    #region Properties
-
-    public static double[] FontSizes
-    {
-      get
-      {
-        return new double[] { 
-		            3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 
-		            10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0,
-		            16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0,
-		            32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0,
-		            80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0
-		            };
-      }
-    }
-
-    #endregion
-
-    #region Constructors
-
-    static RichTextBoxFormatBar()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( RichTextBoxFormatBar ), new FrameworkPropertyMetadata( typeof( RichTextBoxFormatBar ) ) );
-    }
-
-    public RichTextBoxFormatBar()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-
-
-
-    #endregion
-
-    #region Event Hanlders
-
-    private void FontFamily_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count == 0 )
-        return;
-
-      FontFamily editValue = ( FontFamily )e.AddedItems[ 0 ];
-      ApplyPropertyValueToSelectedText( TextElement.FontFamilyProperty, editValue );
-      _waitingForMouseOver = true;
-    }
-
-    private void FontSize_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count == 0 )
-        return;
-
-      ApplyPropertyValueToSelectedText( TextElement.FontSizeProperty, e.AddedItems[ 0 ] );
-      _waitingForMouseOver = true;
-    }
-
-    void FontColor_SelectedColorChanged( object sender, RoutedPropertyChangedEventArgs<Color?> e )
-    {
-      Color? selectedColor = ( Color? )e.NewValue;
-      ApplyPropertyValueToSelectedText( TextElement.ForegroundProperty, selectedColor.HasValue ? new SolidColorBrush( selectedColor.Value ) : null );
-      _waitingForMouseOver = true;
-    }
-
-    private void FontBackgroundColor_SelectedColorChanged( object sender, RoutedPropertyChangedEventArgs<Color?> e )
-    {
-      Color? selectedColor = ( Color? )e.NewValue;
-      ApplyPropertyValueToSelectedText( TextElement.BackgroundProperty, selectedColor.HasValue ? new SolidColorBrush( selectedColor.Value ) : null );
-      _waitingForMouseOver = true;
-    }
-
-    private void Bullets_Clicked( object sender, RoutedEventArgs e )
-    {
-      if( BothSelectionListsAreChecked() && ( _btnNumbers != null) )
-      {
-        _btnNumbers.IsChecked = false;
-      }
-    }
-
-    private void Numbers_Clicked( object sender, RoutedEventArgs e )
-    {
-      if( BothSelectionListsAreChecked() && ( _btnBullets != null) )
-      {
-        _btnBullets.IsChecked = false;
-      }
-    }
-
-    private void DragWidget_DragDelta( object sender, DragDeltaEventArgs e )
-    {
-      ProcessMove( e );
-    }
-
-    protected override void OnMouseEnter( System.Windows.Input.MouseEventArgs e )
-    {
-      base.OnMouseEnter( e );
-      _waitingForMouseOver = false;
-    }
-
-    #endregion //Event Hanlders
-
-    #region Methods
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _dragWidget != null )
-      {
-        _dragWidget.DragDelta -= new DragDeltaEventHandler( DragWidget_DragDelta );
-      }
-
-      if( _cmbFontFamilies != null )
-      {
-        _cmbFontFamilies.SelectionChanged -= new SelectionChangedEventHandler( FontFamily_SelectionChanged );
-      }
-
-      if( _cmbFontSizes != null )
-      {
-        _cmbFontSizes.SelectionChanged -= new SelectionChangedEventHandler( FontSize_SelectionChanged );
-      }
-
-      if( _btnBullets != null )
-      {
-        _btnBullets.Click -= new RoutedEventHandler( Bullets_Clicked );
-      }
-
-      if( _btnNumbers != null )
-      {
-        _btnNumbers.Click -= new RoutedEventHandler( Numbers_Clicked );
-      }
-
-      if( _cmbFontBackgroundColor != null )
-      {
-        _cmbFontBackgroundColor.SelectedColorChanged -= new RoutedPropertyChangedEventHandler<Color?>( FontBackgroundColor_SelectedColorChanged );
-      }
-
-      if( _cmbFontColor != null )
-      {
-        _cmbFontColor.SelectedColorChanged -= new RoutedPropertyChangedEventHandler<Color?>( FontColor_SelectedColorChanged );
-      }
-
-      this.GetTemplateComponent( ref _cmbFontFamilies, "_cmbFontFamilies" );
-      this.GetTemplateComponent( ref _cmbFontSizes, "_cmbFontSizes" );
-      this.GetTemplateComponent( ref _cmbFontBackgroundColor, "_cmbFontBackgroundColor" );
-      this.GetTemplateComponent( ref _cmbFontColor, "_cmbFontColor" );
-      this.GetTemplateComponent( ref _btnNumbers, "_btnNumbers" );
-      this.GetTemplateComponent( ref _btnBullets, "_btnBullets" );
-      this.GetTemplateComponent( ref _btnBold, "_btnBold" );
-      this.GetTemplateComponent( ref _btnItalic, "_btnItalic" );
-      this.GetTemplateComponent( ref _btnUnderline, "_btnUnderline" );
-      this.GetTemplateComponent( ref _btnAlignLeft, "_btnAlignLeft" );
-      this.GetTemplateComponent( ref _btnAlignCenter, "_btnAlignCenter" );
-      this.GetTemplateComponent( ref _btnAlignRight, "_btnAlignRight" );
-      this.GetTemplateComponent( ref _dragWidget, "_dragWidget" );
-
-      if( _dragWidget != null )
-      {
-        _dragWidget.DragDelta += new DragDeltaEventHandler( DragWidget_DragDelta );
-      }
-
-      if( _cmbFontFamilies != null )
-      {
-        _cmbFontFamilies.ItemsSource = FontUtilities.Families.OrderBy( fontFamily => fontFamily.Source );
-        _cmbFontFamilies.SelectionChanged += new SelectionChangedEventHandler( FontFamily_SelectionChanged );
-      }
-
-      if( _cmbFontSizes != null )
-      {
-        _cmbFontSizes.ItemsSource = FontSizes;
-        _cmbFontSizes.SelectionChanged += new SelectionChangedEventHandler( FontSize_SelectionChanged );
-      }
-
-      if( _btnBullets != null )
-      {
-        _btnBullets.Click += new RoutedEventHandler( Bullets_Clicked );
-      }
-
-      if( _btnNumbers != null )
-      {
-        _btnNumbers.Click += new RoutedEventHandler( Numbers_Clicked );
-      }
-
-      if( _cmbFontBackgroundColor != null )
-      {
-        _cmbFontBackgroundColor.SelectedColorChanged += new RoutedPropertyChangedEventHandler<Color?>( FontBackgroundColor_SelectedColorChanged );
-      }
-
-      if( _cmbFontColor != null )
-      {
-        _cmbFontColor.SelectedColorChanged += new RoutedPropertyChangedEventHandler<Color?>( FontColor_SelectedColorChanged );
-      }
-
-      // Update the ComboBoxes when changing themes.
-      this.Update();
-    }
-
-    private void GetTemplateComponent<T>( ref T partMember, string partName ) where T : class
-    {
-      partMember = ( this.Template != null )
-        ? this.Template.FindName( partName, this ) as T
-        : null;
-    }
-
-    private void UpdateToggleButtonState()
-    {
-      UpdateItemCheckedState( _btnBold, TextElement.FontWeightProperty, FontWeights.Bold );
-      UpdateItemCheckedState( _btnItalic, TextElement.FontStyleProperty, FontStyles.Italic );
-      UpdateItemCheckedState( _btnUnderline, Inline.TextDecorationsProperty, TextDecorations.Underline );
-
-      UpdateItemCheckedState( _btnAlignLeft, Paragraph.TextAlignmentProperty, TextAlignment.Left );
-      UpdateItemCheckedState( _btnAlignCenter, Paragraph.TextAlignmentProperty, TextAlignment.Center );
-      UpdateItemCheckedState( _btnAlignRight, Paragraph.TextAlignmentProperty, TextAlignment.Right );
-    }
-
-    void UpdateItemCheckedState( ToggleButton button, DependencyProperty formattingProperty, object expectedValue )
-    {
-      object currentValue = DependencyProperty.UnsetValue;
-      if( ( Target != null ) && ( Target.Selection != null ) )
-      {
-        currentValue = Target.Selection.GetPropertyValue( formattingProperty );
-      }
-
-      if( currentValue == DependencyProperty.UnsetValue )
-        return;
-
-      if( button != null )
-      {
-        button.IsChecked = ( currentValue == null )
-                            ? false
-                            : currentValue != null && currentValue.Equals( expectedValue );
-      }
-    }
-
-    private void UpdateSelectedFontFamily()
-    {
-      object value = DependencyProperty.UnsetValue;
-      if( ( Target != null ) && ( Target.Selection != null ) )
-      {
-        value = Target.Selection.GetPropertyValue( TextElement.FontFamilyProperty );
-      }
-
-      if( value == DependencyProperty.UnsetValue )
-        return;
-
-      FontFamily currentFontFamily = ( FontFamily )value;
-      if( (currentFontFamily != null) && ( _cmbFontFamilies != null) )
-      {
-        _cmbFontFamilies.SelectedItem = currentFontFamily;
-      }
-    }
-
-    private void UpdateSelectedFontSize()
-    {
-      object value = DependencyProperty.UnsetValue;
-      if( ( Target != null ) && ( Target.Selection != null ) )
-      {
-        value = Target.Selection.GetPropertyValue( TextElement.FontSizeProperty );
-      }
-
-      if( value == DependencyProperty.UnsetValue )
-        return;
-
-      if( _cmbFontSizes != null )
-      {
-        _cmbFontSizes.SelectedValue = value;
-      }
-    }
-
-    private void UpdateFontColor()
-    {
-      object value = DependencyProperty.UnsetValue;
-      if( ( Target != null ) && ( Target.Selection != null ) )
-      {
-        value = Target.Selection.GetPropertyValue( TextElement.ForegroundProperty );
-      }
-
-      if( value == DependencyProperty.UnsetValue )
-        return;
-
-      Color? currentColor =  ( ( value == null )
-                              ? null
-                              : ( Color? )( ( SolidColorBrush )value ).Color );
-      if( _cmbFontColor != null )
-      {
-        _cmbFontColor.SelectedColor = currentColor;
-      }
-    }
-
-    private void UpdateFontBackgroundColor()
-    {
-      object value = DependencyProperty.UnsetValue;
-      if( ( Target != null ) && ( Target.Selection != null ) )
-      {
-        value = Target.Selection.GetPropertyValue( TextElement.BackgroundProperty );
-      }
-
-      if( value == DependencyProperty.UnsetValue )
-        return;
-
-      Color? currentColor = ( ( value == null )
-                              ? null
-                              : ( Color? )( ( SolidColorBrush )value ).Color );
-      if( _cmbFontBackgroundColor != null )
-      {
-        _cmbFontBackgroundColor.SelectedColor = currentColor;
-      }
-    }
-
-    /// <summary>
-    /// Updates the visual state of the List styles, such as Numbers and Bullets.
-    /// </summary>
-    private void UpdateSelectionListType()
-    {
-      if( (_btnNumbers == null) || ( _btnBullets == null) )
-        return;
-
-      //uncheck both
-      _btnBullets.IsChecked = false;
-      _btnNumbers.IsChecked = false;
-
-      Paragraph startParagraph = ( ( Target != null ) && ( Target.Selection != null ) )
-                                  ? Target.Selection.Start.Paragraph
-                                  : null;
-      Paragraph endParagraph = ( ( Target != null ) && ( Target.Selection != null ) )
-                                ? Target.Selection.End.Paragraph
-                                : null;
-      if( startParagraph != null && endParagraph != null && ( startParagraph.Parent is ListItem ) && ( endParagraph.Parent is ListItem ) && object.ReferenceEquals( ( ( ListItem )startParagraph.Parent ).List, ( ( ListItem )endParagraph.Parent ).List ) )
-      {
-        TextMarkerStyle markerStyle = ( ( ListItem )startParagraph.Parent ).List.MarkerStyle;
-        if( markerStyle == TextMarkerStyle.Disc ) //bullets
-        {
-          _btnBullets.IsChecked = true;
-        }
-        else if( markerStyle == TextMarkerStyle.Decimal ) //numbers
-        {
-          _btnNumbers.IsChecked = true;
-        }
-      }
-    }
-
-    /// <summary>
-    /// Checks to see if both selection lists are checked. (Bullets and Numbers)
-    /// </summary>
-    /// <returns></returns>
-    private bool BothSelectionListsAreChecked()
-    {
-      return (( _btnBullets != null) && (_btnBullets.IsChecked == true) )
-          && (( _btnNumbers != null) && (_btnNumbers.IsChecked == true));
-    }
-
-    void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value )
-    {
-      if( ( Target == null ) || ( Target.Selection == null ) )
-        return;
-
-      SolidColorBrush solidColorBrush = value as SolidColorBrush;
-      if( ( solidColorBrush != null ) && solidColorBrush.Color.Equals( Colors.Transparent ) )
-      {
-        Target.Selection.ApplyPropertyValue( formattingProperty, null );
-      }
-      else
-      {
-        Target.Selection.ApplyPropertyValue( formattingProperty, value );
-      }
-    }
-
-    private void ProcessMove( DragDeltaEventArgs e )
-    {
-      AdornerLayer layer = AdornerLayer.GetAdornerLayer( Target );
-      UIElementAdorner<Control> adorner = layer.GetAdorners( Target ).OfType<UIElementAdorner<Control>>().First();
-      adorner.SetOffsets( adorner.OffsetLeft + e.HorizontalChange, adorner.OffsetTop + e.VerticalChange );
-    }
-
-    #endregion //Methods
-
-    #region IRichTextBoxFormatBar Interface
-
-    #region Target
-
-    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register( "Target", typeof( global::System.Windows.Controls.RichTextBox ), typeof( RichTextBoxFormatBar ), new PropertyMetadata( null, OnRichTextBoxPropertyChanged ) );
-    public global::System.Windows.Controls.RichTextBox Target
-    {
-      get
-      {
-        return ( global::System.Windows.Controls.RichTextBox )GetValue( TargetProperty );
-      }
-      set
-      {
-        SetValue( TargetProperty, value );
-      }
-    }
-
-    private static void OnRichTextBoxPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      RichTextBoxFormatBar formatBar = d as RichTextBoxFormatBar;
-    }
-
-    #endregion //Target
-
-    public bool PreventDisplayFadeOut
-    {
-      get
-      {
-        return ( (( _cmbFontFamilies != null) && _cmbFontFamilies.IsDropDownOpen)
-              || (( _cmbFontSizes != null) && _cmbFontSizes.IsDropDownOpen)
-              ||  (( _cmbFontBackgroundColor != null) && _cmbFontBackgroundColor.IsOpen)
-              || (( _cmbFontColor != null) && _cmbFontColor.IsOpen)
-              || _waitingForMouseOver );
-      }
-    }
-
-    public void Update()
-    {
-      UpdateToggleButtonState();
-      UpdateSelectedFontFamily();
-      UpdateSelectedFontSize();
-      UpdateFontColor();
-      UpdateFontBackgroundColor();
-      UpdateSelectionListType();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
deleted file mode 100644
index 1b3c53d9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class RichTextBoxFormatBarManager : DependencyObject
-  {
-    #region Members
-
-    private global::System.Windows.Controls.RichTextBox _richTextBox;
-    private UIElementAdorner<Control> _adorner;
-    private IRichTextBoxFormatBar _toolbar;
-    private Window _parentWindow;
-
-    private const double _hideAdornerDistance = 150d;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region FormatBar
-
-    public static readonly DependencyProperty FormatBarProperty = DependencyProperty.RegisterAttached( "FormatBar", typeof( IRichTextBoxFormatBar ), typeof( RichTextBox ), new PropertyMetadata( null, OnFormatBarPropertyChanged ) );
-    public static void SetFormatBar( UIElement element, IRichTextBoxFormatBar value )
-    {
-      element.SetValue( FormatBarProperty, value );
-    }
-    public static IRichTextBoxFormatBar GetFormatBar( UIElement element )
-    {
-      return ( IRichTextBoxFormatBar )element.GetValue( FormatBarProperty );
-    }
-
-    private static void OnFormatBarPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      global::System.Windows.Controls.RichTextBox rtb = d as global::System.Windows.Controls.RichTextBox;
-      if( rtb == null )
-        throw new Exception( "A FormatBar can only be applied to a RichTextBox." );
-
-      RichTextBoxFormatBarManager manager = new RichTextBoxFormatBarManager();
-      manager.AttachFormatBarToRichtextBox( rtb, e.NewValue as IRichTextBoxFormatBar );
-    }
-
-    #endregion //FormatBar
-
-    public bool IsAdornerVisible
-    {
-      get
-      {
-        return _adorner.Visibility == Visibility.Visible;
-      }
-    }
-
-    #endregion //Properties
-
-    #region Event Handlers
-
-    void RichTextBox_MouseButtonUp( object sender, MouseButtonEventArgs e )
-    {
-      if( e.ChangedButton == MouseButton.Left && e.LeftButton == MouseButtonState.Released )
-      {
-        if( !_richTextBox.IsReadOnly )
-        {
-          TextRange selectedText = new TextRange( _richTextBox.Selection.Start, _richTextBox.Selection.End );
-#if !VS2008
-          if( selectedText.Text.Length > 0 && !String.IsNullOrWhiteSpace( selectedText.Text ) )
-            ShowAdorner();
-#else
-          if( selectedText.Text.Length > 0 && !String.IsNullOrEmpty( selectedText.Text ) )
-            ShowAdorner();
-#endif
-          else
-            HideAdorner();
-
-          e.Handled = true;
-        }
-      }
-      else
-        HideAdorner();
-    }
-
-    private void OnPreviewMouseMoveParentWindow( object sender, MouseEventArgs e )
-    {
-      Point p = e.GetPosition( _adorner );
-      double maxDist = 0d;
-      bool preventDisplayFadeOut = ( ( _adorner.Child != null ) && ( _adorner.Child is IRichTextBoxFormatBar ) ) ?
-                                  ( ( IRichTextBoxFormatBar )_adorner.Child ).PreventDisplayFadeOut :
-                                  false;
-
-      //Mouse is inside FormatBar: Nothing to do.
-      if( preventDisplayFadeOut ||
-        ( p.X >= 0 ) && ( p.X <= _adorner.ActualWidth ) && ( p.Y >= 0 ) && ( p.Y <= _adorner.ActualHeight ) )
-      {
-        return;
-      }
-      //Mouse is too much outside FormatBar: Close it.
-      else if( ( p.X < -_hideAdornerDistance ) || ( p.X > _adorner.ActualWidth + _hideAdornerDistance ) || ( p.Y < -_hideAdornerDistance ) || ( p.Y > _adorner.ActualHeight + _hideAdornerDistance ) )
-      {
-        HideAdorner();
-      }
-      //Mouse is just outside FormatBar: Vary its opacity.
-      else
-      {
-        if( p.X < 0 )
-          maxDist = -p.X;
-        else if( p.X > _adorner.ActualWidth )
-          maxDist = p.X - _adorner.ActualWidth;
-
-        if( p.Y < 0 )
-          maxDist = Math.Max( maxDist, -p.Y );
-        else if( p.Y > _adorner.ActualHeight )
-          maxDist = Math.Max( maxDist, p.Y - _adorner.ActualHeight );
-
-        _adorner.Opacity = 1d - ( Math.Min( maxDist, 100d ) / 100d );
-      }
-    }
-
-    void RichTextBox_TextChanged( object sender, TextChangedEventArgs e )
-    {
-      //This fixes the bug when applying text transformations the text would lose it's highlight. That was because the RichTextBox was losing focus,
-      //so we just give it focus again and it seems to do the trick of re-highlighting it.
-      if( !_richTextBox.IsFocused && !_richTextBox.Selection.IsEmpty )
-        _richTextBox.Focus();
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    /// <summary>
-    /// Attaches a FormatBar to a RichtextBox
-    /// </summary>
-    /// <param name="richTextBox">The RichtextBox to attach to.</param>
-    /// <param name="formatBar">The Formatbar to attach.</param>
-    private void AttachFormatBarToRichtextBox( global::System.Windows.Controls.RichTextBox richTextBox, IRichTextBoxFormatBar formatBar )
-    {
-      _richTextBox = richTextBox;
-      //we cannot use the PreviewMouseLeftButtonUp event because of selection bugs.
-      //we cannot use the MouseLeftButtonUp event because it is handled by the RichTextBox and does not bubble up to here, so we must
-      //add a hander to the MouseUpEvent using the Addhandler syntax, and specify to listen for handled events too.
-      _richTextBox.AddHandler( Mouse.MouseUpEvent, new MouseButtonEventHandler( RichTextBox_MouseButtonUp ), true );
-      _richTextBox.TextChanged += RichTextBox_TextChanged;
-
-      _adorner = new UIElementAdorner<Control>( _richTextBox );
-
-      formatBar.Target = _richTextBox;
-      _toolbar = formatBar;
-    }
-
-    /// <summary>
-    /// Shows the FormatBar
-    /// </summary>
-    void ShowAdorner()
-    {
-      if( _adorner.Visibility == Visibility.Visible )
-        return;
-
-      VerifyAdornerLayer();
-
-      Control adorningEditor = _toolbar as Control;
-
-      if( _adorner.Child == null )
-        _adorner.Child = adorningEditor;
-
-      adorningEditor.ApplyTemplate();
-      _toolbar.Update();
-
-      _adorner.Visibility = Visibility.Visible;
-
-      PositionFormatBar( adorningEditor );
-
-      _parentWindow = TreeHelper.FindParent<Window>( _adorner );
-      if( _parentWindow != null )
-      {
-        Mouse.AddMouseMoveHandler( _parentWindow, OnPreviewMouseMoveParentWindow );
-      }
-    }
-
-    /// <summary>
-    /// Positions the FormatBar so that is does not go outside the bounds of the RichTextBox or covers the selected text
-    /// </summary>
-    /// <param name="adorningEditor"></param>
-    private void PositionFormatBar( Control adorningEditor )
-    {
-      Point mousePosition = Mouse.GetPosition( _richTextBox );
-
-      var left = mousePosition.X;
-      var top = mousePosition.Y;
-
-      // Top boundary
-      if( top < 0 )
-      {
-        top = 5d;
-      }
-
-      // Left boundary
-      if( left < 0 )
-      {
-        left = 5d;
-      }
-
-      // Right boundary
-      if( left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 10d )
-      {
-        left = _richTextBox.ActualWidth - adorningEditor.ActualWidth - 10d;
-      }
-
-      // Bottom boundary
-      if( top + adorningEditor.ActualHeight > _richTextBox.ActualHeight - 10d )
-      {
-        top = _richTextBox.ActualHeight - adorningEditor.ActualHeight - 10d;
-      }
-
-      _adorner.SetOffsets( left, top );
-    }
-
-    /// <summary>
-    /// Ensures that the IRichTextFormatBar is in the adorner layer.
-    /// </summary>
-    /// <returns>True if the IRichTextFormatBar is in the adorner layer, else false.</returns>
-    bool VerifyAdornerLayer()
-    {
-      if( _adorner.Parent != null )
-        return true;
-
-      AdornerLayer layer = AdornerLayer.GetAdornerLayer( _richTextBox );
-      if( layer == null )
-        return false;
-
-      layer.Add( _adorner );
-      return true;
-    }
-
-    /// <summary>
-    /// Hides the IRichTextFormatBar that is in the adornor layer.
-    /// </summary>
-    void HideAdorner()
-    {
-      if( IsAdornerVisible )
-      {
-        _adorner.Visibility = Visibility.Collapsed;
-        //_adorner.Child = null;
-        if( _parentWindow != null )
-        {
-          Mouse.RemoveMouseMoveHandler( _parentWindow, OnPreviewMouseMoveParentWindow );
-        }
-      }
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 8a6a8f75..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,751 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-  <ControlTemplate x:Key="ThumbControlTemplate"
-                   TargetType="{x:Type Thumb}">
-    <Border Background="Transparent"
-            Cursor="Hand"
-            ToolTip="Click to Drag">
-      <StackPanel VerticalAlignment="Center"
-                  Width="75">
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-      </StackPanel>
-    </Border>
-  </ControlTemplate>
-
-  <SolidColorBrush x:Key="MouseOverBorderBrush"
-                   Color="#FFFFB700" />
-  <LinearGradientBrush x:Key="MouseOverBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFEFBF4" />
-    <GradientStop Offset="0.19"
-                  Color="#FFFDE7CE" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFDDEB8" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFCE6B" />
-    <GradientStop Offset="0.79"
-                  Color="#FFFFDE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFFFEBAA" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="CheckedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="CheckedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFFDCA0" />
-    <GradientStop Offset="0.18"
-                  Color="#FFFFD692" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFC45D" />
-    <GradientStop Offset="1"
-                  Color="#FFFFD178" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="PressedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="PressedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFE3C085" />
-    <GradientStop Offset="0.19"
-                  Color="#FFF4CC89" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5C777" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5BB56" />
-    <GradientStop Offset="0.79"
-                  Color="#FFF4CE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFF3E28D" />
-  </LinearGradientBrush>
-
-  <Style x:Key="FormatBarToggleButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderBrush"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Height"
-            Value="22" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="ToolTipService.InitialShowDelay"
-            Value="900" />
-    <Setter Property="ToolTipService.ShowDuration"
-            Value="20000" />
-    <Setter Property="ToolTipService.BetweenShowDelay"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    CornerRadius="0" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="0">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="0"
-                      Padding="{TemplateBinding Padding}">
-                <StackPanel x:Name="StackPanel"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                  <ContentPresenter x:Name="Content"
-                                    Content="{TemplateBinding Content}"
-                                    Margin="1"
-                                    RenderOptions.BitmapScalingMode="NearestNeighbor"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                </StackPanel>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Opacity"
-                      TargetName="Content"
-                      Value="0.5" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="FontColorButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderBrush"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Height"
-            Value="22" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="ToolTipService.InitialShowDelay"
-            Value="900" />
-    <Setter Property="ToolTipService.ShowDuration"
-            Value="20000" />
-    <Setter Property="ToolTipService.BetweenShowDelay"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="0" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="0">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="0"
-                      Padding="{TemplateBinding Padding}">
-                <Grid>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid>
-                    <Image Source="../Images/FontColorPicker16.png"
-                           Width="16"
-                           Height="16">
-                    </Image>
-                    <Rectangle Grid.Row="1"
-                               Height="4"
-                               Margin="0,12,0,0"
-                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                  </Grid>
-
-                  <Path Grid.Column="1"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="FontBackgrounColorButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderBrush"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Height"
-            Value="22" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="ToolTipService.InitialShowDelay"
-            Value="900" />
-    <Setter Property="ToolTipService.ShowDuration"
-            Value="20000" />
-    <Setter Property="ToolTipService.BetweenShowDelay"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="0" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="0">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="0"
-                      Padding="{TemplateBinding Padding}">
-                <Grid>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid>
-                    <Image Source="../Images/TextHighlightColorPicker16.png"
-                           Width="16"
-                           Height="16">
-                    </Image>
-                    <Rectangle Grid.Row="1"
-                               Height="4"
-                               Margin="0,12,0,0"
-                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                  </Grid>
-
-                  <Path Grid.Column="1"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- =================================================================== -->
-  <!-- Template                                                            -->
-  <!-- =================================================================== -->
-  <ControlTemplate x:Key="richTextBoxFormatBarTemplate"
-                   TargetType="{x:Type local:RichTextBoxFormatBar}">
-    <ControlTemplate.Resources>
-      <Style TargetType="{x:Type Separator}"
-             BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-    </ControlTemplate.Resources>
-    <Border CornerRadius="0"
-            BorderThickness="1"
-            BorderBrush="#FFADC7DE"
-            Background="#FFDAE8F9">
-      <Grid Margin="5,0,5,5">
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <Thumb x:Name="_dragWidget"
-               Height="10"
-               Template="{StaticResource ThumbControlTemplate}">
-        </Thumb>
-
-        <StackPanel Grid.Row="1">
-          <StackPanel Orientation="Horizontal">
-            <ComboBox x:Name="_cmbFontFamilies"
-                      IsEditable="True"
-                      Width="100"
-                      ToolTip="Font Family">
-            </ComboBox>
-
-            <ComboBox x:Name="_cmbFontSizes"
-                      IsEditable="True"
-                      Width="43"
-                      ToolTip="Font Size">
-            </ComboBox>
-
-            <Separator >
-            </Separator>
-
-            <ToggleButton x:Name="_btnBullets"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleBullets"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Bullets">
-              <Image Source="../Images/Bullets16.png">
-              </Image>
-            </ToggleButton>
-
-            <ToggleButton x:Name="_btnNumbers"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleNumbering"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Numbering">
-              <Image Source="../Images/Numbering16.png">
-              </Image>
-            </ToggleButton>
-
-          </StackPanel>
-
-          <StackPanel Orientation="Horizontal"
-                      Margin="0,3,0,0">
-            <ToggleButton x:Name="_btnBold"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleBold"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Bold">
-              <Image Source="../Images/Bold16.png" >
-              </Image>
-            </ToggleButton>
-            <ToggleButton x:Name="_btnItalic"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="{x:Static EditingCommands.ToggleItalic}"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Italic">
-              <Image Source="../Images/Italic16.png" >
-              </Image>
-            </ToggleButton>
-            <ToggleButton x:Name="_btnUnderline"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="{x:Static EditingCommands.ToggleUnderline}"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Underline">
-              <Image Source="../Images/Underline16.png" >
-              </Image>
-            </ToggleButton>
-
-            <Separator>
-            </Separator>
-
-            <RadioButton x:Name="_btnAlignLeft"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignLeft}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Left">
-              <Image Source="../Images/LeftAlign16.png">
-              </Image>
-            </RadioButton>
-            <RadioButton x:Name="_btnAlignCenter"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignCenter}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Center">
-              <Image Source="../Images/CenterAlign16.png">
-              </Image>
-            </RadioButton>
-            <RadioButton x:Name="_btnAlignRight"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignRight}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Right">
-              <Image Source="../Images/RightAlign16.png">
-              </Image>
-            </RadioButton>
-
-            <Separator>
-            </Separator>
-
-            <local:ColorPicker x:Name="_cmbFontBackgroundColor"
-                               BorderThickness="0"
-                               ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
-                               ToolTip="Text Highlight Color">
-            </local:ColorPicker>
-
-            <local:ColorPicker x:Name="_cmbFontColor"
-                               BorderThickness="0"
-                               ButtonStyle="{StaticResource FontColorButtonStyle}"
-                               ToolTip="Font Color">
-            </local:ColorPicker>
-
-          </StackPanel>
-
-        </StackPanel>
-      </Grid>
-    </Border>
-  </ControlTemplate>
-
-  <!-- =================================================================== -->
-  <!-- Style                                                               -->
-  <!-- =================================================================== -->
-  <Style TargetType="{x:Type local:RichTextBoxFormatBar}">
-    <Setter Property="IsTabStop"
-            Value="false" />
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Template"
-            Value="{StaticResource richTextBoxFormatBarTemplate}" />
-    <Setter Property="Effect">
-      <Setter.Value>
-        <DropShadowEffect BlurRadius="5"
-                          Opacity=".25" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
deleted file mode 100644
index 1457bb50..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
+++ /dev/null
@@ -1,750 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-  <ControlTemplate x:Key="ThumbControlTemplate"
-                   TargetType="{x:Type Thumb}">
-    <Border Background="Transparent"
-            Cursor="Hand"
-            ToolTip="Click to Drag">
-      <StackPanel VerticalAlignment="Center"
-                  Width="75">
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-      </StackPanel>
-    </Border>
-  </ControlTemplate>
-
-  <SolidColorBrush x:Key="MouseOverBorderBrush"
-                   Color="#FFFFB700" />
-  <LinearGradientBrush x:Key="MouseOverBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFEFBF4" />
-    <GradientStop Offset="0.19"
-                  Color="#FFFDE7CE" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFDDEB8" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFCE6B" />
-    <GradientStop Offset="0.79"
-                  Color="#FFFFDE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFFFEBAA" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="CheckedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="CheckedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFFDCA0" />
-    <GradientStop Offset="0.18"
-                  Color="#FFFFD692" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFC45D" />
-    <GradientStop Offset="1"
-                  Color="#FFFFD178" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="PressedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="PressedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFE3C085" />
-    <GradientStop Offset="0.19"
-                  Color="#FFF4CC89" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5C777" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5BB56" />
-    <GradientStop Offset="0.79"
-                  Color="#FFF4CE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFF3E28D" />
-  </LinearGradientBrush>
-
-  <Style x:Key="FormatBarToggleButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderBrush"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Height"
-            Value="22" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="ToolTipService.InitialShowDelay"
-            Value="900" />
-    <Setter Property="ToolTipService.ShowDuration"
-            Value="20000" />
-    <Setter Property="ToolTipService.BetweenShowDelay"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    CornerRadius="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      Padding="{TemplateBinding Padding}">
-                <StackPanel x:Name="StackPanel"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                  <ContentPresenter x:Name="Content"
-                                    Content="{TemplateBinding Content}"
-                                    Margin="1"
-                                    RenderOptions.BitmapScalingMode="NearestNeighbor"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                </StackPanel>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Opacity"
-                      TargetName="Content"
-                      Value="0.5" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="FontColorButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderBrush"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Height"
-            Value="22" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="ToolTipService.InitialShowDelay"
-            Value="900" />
-    <Setter Property="ToolTipService.ShowDuration"
-            Value="20000" />
-    <Setter Property="ToolTipService.BetweenShowDelay"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      Padding="{TemplateBinding Padding}">
-                <Grid>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid>
-                    <Image Source="../Images/FontColorPicker16.png"
-                           Width="16"
-                           Height="16" >
-                    </Image>
-                    <Rectangle Grid.Row="1"
-                               Height="4"
-                               Margin="0,12,0,0"
-                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                  </Grid>
-
-                  <Path Grid.Column="1"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="FontBackgrounColorButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderBrush"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Height"
-            Value="22" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="ToolTipService.InitialShowDelay"
-            Value="900" />
-    <Setter Property="ToolTipService.ShowDuration"
-            Value="20000" />
-    <Setter Property="ToolTipService.BetweenShowDelay"
-            Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      Padding="{TemplateBinding Padding}">
-                <Grid>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid>
-                    <Image Source="../Images/TextHighlightColorPicker16.png"
-                           Width="16"
-                           Height="16" >
-                    </Image>
-                    <Rectangle Grid.Row="1"
-                               Height="4"
-                               Margin="0,12,0,0"
-                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                  </Grid>
-
-                  <Path Grid.Column="1"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- =================================================================== -->
-  <!-- Template                                                            -->
-  <!-- =================================================================== -->
-  <ControlTemplate x:Key="richTextBoxFormatBarTemplate"
-                   TargetType="{x:Type local:RichTextBoxFormatBar}">
-    <ControlTemplate.Resources>
-      <Style TargetType="{x:Type Separator}"
-             BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-    </ControlTemplate.Resources>
-    <Border CornerRadius="3"
-            BorderThickness="1"
-            BorderBrush="Gray"
-            Background="WhiteSmoke">
-      <Grid Margin="5,0,5,5">
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <Thumb x:Name="_dragWidget"
-               Height="10"
-               Template="{StaticResource ThumbControlTemplate}" >
-        </Thumb>
-
-        <StackPanel Grid.Row="1">
-          <StackPanel Orientation="Horizontal">
-            <ComboBox x:Name="_cmbFontFamilies"
-                      IsEditable="True"
-                      Width="100"
-                      ToolTip="Font Family" >
-            </ComboBox>
-
-            <ComboBox x:Name="_cmbFontSizes"
-                      IsEditable="True"
-                      Width="43"
-                      ToolTip="Font Size" >
-            </ComboBox>
-
-            <Separator>
-            </Separator>
-
-            <ToggleButton x:Name="_btnBullets"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleBullets"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Bullets">
-              <Image Source="../Images/Bullets16.png" >
-              </Image>
-            </ToggleButton>
-
-            <ToggleButton x:Name="_btnNumbers"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleNumbering"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Numbering">
-              <Image Source="../Images/Numbering16.png" >
-              </Image>
-            </ToggleButton>
-
-          </StackPanel>
-
-          <StackPanel Orientation="Horizontal"
-                      Margin="0,3,0,0">
-            <ToggleButton x:Name="_btnBold"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleBold"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Bold">
-              <Image Source="../Images/Bold16.png" >
-              </Image>
-            </ToggleButton>
-            <ToggleButton x:Name="_btnItalic"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="{x:Static EditingCommands.ToggleItalic}"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Italic">
-              <Image Source="../Images/Italic16.png" >
-              </Image>
-            </ToggleButton>
-            <ToggleButton x:Name="_btnUnderline"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="{x:Static EditingCommands.ToggleUnderline}"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Underline">
-              <Image Source="../Images/Underline16.png" >
-              </Image>
-            </ToggleButton>
-
-            <Separator>
-            </Separator>
-
-            <RadioButton x:Name="_btnAlignLeft"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignLeft}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Left">
-              <Image Source="../Images/LeftAlign16.png">
-              </Image>
-            </RadioButton>
-            <RadioButton x:Name="_btnAlignCenter"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignCenter}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Center">
-              <Image Source="../Images/CenterAlign16.png" >
-              </Image>
-            </RadioButton>
-            <RadioButton x:Name="_btnAlignRight"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignRight}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Right">
-              <Image Source="../Images/RightAlign16.png" >
-              </Image>
-            </RadioButton>
-
-            <Separator>
-            </Separator>
-
-            <local:ColorPicker x:Name="_cmbFontBackgroundColor"
-                               BorderThickness="0"
-                               ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
-                               ToolTip="Text Highlight Color" >
-            </local:ColorPicker>
-
-            <local:ColorPicker x:Name="_cmbFontColor"
-                               BorderThickness="0"
-                               ButtonStyle="{StaticResource FontColorButtonStyle}"
-                               ToolTip="Font Color" >
-            </local:ColorPicker>
-
-          </StackPanel>
-
-        </StackPanel>
-      </Grid>
-    </Border>
-  </ControlTemplate>
-
-  <!-- =================================================================== -->
-  <!-- Style                                                               -->
-  <!-- =================================================================== -->
-  <Style TargetType="{x:Type local:RichTextBoxFormatBar}">
-    <Setter Property="Template"
-            Value="{StaticResource richTextBoxFormatBarTemplate}" />
-    <Setter Property="Effect">
-      <Setter.Value>
-        <DropShadowEffect BlurRadius="5"
-                          Opacity=".25" />
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="IsTabStop"
-            Value="false" />
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
deleted file mode 100644
index 709437b9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_ActionButton, Type = typeof( Button ) )]
-  public class SplitButton : DropDownButton
-  {
-    private const string PART_ActionButton = "PART_ActionButton";
-
-    #region Constructors
-
-    static SplitButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( SplitButton ), new FrameworkPropertyMetadata( typeof( SplitButton ) ) );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-      Button = GetTemplateChild( PART_ActionButton ) as Button;
-    }
-
-
-  #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index e541166f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,171 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-
-  <!-- =============================================================================== -->
-  <!-- SplitButton                                                                     -->
-  <!-- =============================================================================== -->
-  <conv:ThicknessSideRemovalConverter x:Key="ThicknessSideRemovalConverter" />
-
-  <Style TargetType="{x:Type local:SplitButton}">
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="DropDownContentBackground"
-            Value="{StaticResource PanelBackgroundBrush}" />
-    <Setter Property="Padding"
-            Value="3" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:SplitButton}">
-          <Grid x:Name="MainGrid"
-                SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ControlChrome"
-                                 Background="{TemplateBinding Background}"
-                                 RenderEnabled="{TemplateBinding IsEnabled}">
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Button x:Name="PART_ActionButton"
-                        Margin="0"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        Padding="{TemplateBinding Padding}"
-                        Style="{x:Null}">
-                  <Button.Template>
-                    <ControlTemplate TargetType="Button">
-                      <ContentPresenter />
-                    </ControlTemplate>
-                  </Button.Template>
-                  <Grid>
-                    <chrome:ButtonChrome x:Name="ActionButtonChrome"
-                                         Background="{TemplateBinding Background}"
-                                         Foreground="{TemplateBinding Foreground}"
-                                         BorderThickness="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSideRemovalConverter}, ConverterParameter=2}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         RenderEnabled="{TemplateBinding IsEnabled}"
-                                         RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
-                                         RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
-                      <ContentPresenter Name="ActionButtonContent"
-                                        Margin="{TemplateBinding Padding}"
-                                        Content="{TemplateBinding Content}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        RecognizesAccessKey="true" />
-                    </chrome:ButtonChrome>
-                  </Grid>
-                </Button>
-                <ToggleButton x:Name="PART_ToggleButton"
-                              Grid.Column="1"
-                              IsTabStop="False"
-                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
-                  <ToggleButton.Template>
-                    <ControlTemplate TargetType="ToggleButton">
-                      <ContentPresenter />
-                    </ControlTemplate>
-                  </ToggleButton.Template>
-                  <Grid>
-                    <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                         Background="{TemplateBinding Background}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         BorderThickness="{TemplateBinding BorderThickness}"
-                                         Padding="1,0,1,0"
-                                         RenderChecked="{TemplateBinding IsOpen}"
-                                         RenderEnabled="{TemplateBinding IsEnabled}"
-                                         RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
-                                         RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}">
-                      <Grid x:Name="arrowGlyph"
-                            IsHitTestVisible="False"
-                            Margin="4,3,4,3">
-                        <Path x:Name="Arrow"
-                              Width="9"
-                              Height="5"
-                              Data="{StaticResource DownArrowGeometry}"
-                              Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                              Margin="0,1,0,0" />
-                      </Grid>
-                    </chrome:ButtonChrome>
-                  </Grid>
-                </ToggleButton>
-              </Grid>
-            </chrome:ButtonChrome>
-
-            <Popup x:Name="PART_Popup"
-                   HorizontalOffset="1"
-                   VerticalOffset="1"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   Placement="{TemplateBinding DropDownPosition}"
-                   Focusable="False"
-                   IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
-              <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
-              <Border BorderThickness="1"
-                      Background="{TemplateBinding DropDownContentBackground}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                <ScrollViewer x:Name="DropDownScrollViewer"
-                              VerticalScrollBarVisibility="Auto">
-                  <ContentPresenter x:Name="PART_ContentPresenter"
-                                    Content="{TemplateBinding DropDownContent}" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter TargetName="ActionButtonChrome"
-                      Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
deleted file mode 100644
index 7791fcf0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
+++ /dev/null
@@ -1,197 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush"
-                       EndPoint="0.5,1"
-                       StartPoint="0.5,0">
-    <GradientStop Color="#FFA3AEB9"
-                  Offset="0" />
-    <GradientStop Color="#FF8399A9"
-                  Offset="0.375" />
-    <GradientStop Color="#FF718597"
-                  Offset="0.375" />
-    <GradientStop Color="#FF617584"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <!-- =============================================================================== -->
-  <!-- SplitButton                                                                     -->
-  <!-- =============================================================================== -->
-  <conv:ThicknessSideRemovalConverter x:Key="ThicknessSideRemovalConverter" />
-
-  <Style TargetType="{x:Type local:SplitButton}">
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="DropDownContentBackground"
-            Value="{StaticResource PopupBackgroundBrush}" />
-    <Setter Property="Padding"
-            Value="3" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:SplitButton}">
-          <Grid x:Name="MainGrid"
-                SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ControlChrome"
-                                 Background="{TemplateBinding Background}"
-                                 RenderEnabled="{TemplateBinding IsEnabled}"
-                                 CornerRadius="2.75">
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Button x:Name="PART_ActionButton"
-                        Margin="0"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        Padding="{TemplateBinding Padding}"
-                        Style="{x:Null}">
-                  <Button.Template>
-                    <ControlTemplate TargetType="Button">
-                      <ContentPresenter />
-                    </ControlTemplate>
-                  </Button.Template>
-                  <Grid>
-                    <chrome:ButtonChrome x:Name="ActionButtonChrome"
-                                         Background="{TemplateBinding Background}"
-                                         Foreground="{TemplateBinding Foreground}"
-                                         BorderThickness="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSideRemovalConverter}, ConverterParameter=2}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         CornerRadius="2.75, 0, 0, 2.75"
-                                         RenderEnabled="{TemplateBinding IsEnabled}"
-                                         RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
-                                         RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
-                      <ContentPresenter Name="ActionButtonContent"
-                                        Margin="{TemplateBinding Padding}"
-                                        Content="{TemplateBinding Content}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        RecognizesAccessKey="true" />
-                    </chrome:ButtonChrome>
-                  </Grid>
-                </Button>
-                <ToggleButton x:Name="PART_ToggleButton"
-                              Grid.Column="1"
-                              IsTabStop="False"
-                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
-                  <ToggleButton.Template>
-                    <ControlTemplate TargetType="ToggleButton">
-                      <ContentPresenter />
-                    </ControlTemplate>
-                  </ToggleButton.Template>
-                  <Grid>
-                    <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                         Background="{TemplateBinding Background}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         BorderThickness="{TemplateBinding BorderThickness}"
-                                         Padding="1,0,1,0"
-                                         CornerRadius="0, 2.75, 2.75, 0"
-                                         RenderChecked="{TemplateBinding IsOpen}"
-                                         RenderEnabled="{TemplateBinding IsEnabled}"
-                                         RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
-                                         RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}">
-                      <Grid x:Name="arrowGlyph"
-                            IsHitTestVisible="False"
-                            Margin="4,3,4,3">
-                        <Path x:Name="Arrow"
-                              Width="9"
-                              Height="5"
-                              Data="{StaticResource DownArrowGeometry}"
-                              Fill="#FF000000"
-                              Margin="0,1,0,0" />
-                      </Grid>
-                    </chrome:ButtonChrome>
-                  </Grid>
-                </ToggleButton>
-              </Grid>
-            </chrome:ButtonChrome>
-
-            <Popup x:Name="PART_Popup"
-                   HorizontalOffset="1"
-                   VerticalOffset="1"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   Placement="{TemplateBinding DropDownPosition}"
-                   Focusable="False"
-                   IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
-              <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
-              <Border BorderThickness="1"
-                      Background="{TemplateBinding DropDownContentBackground}"
-                      BorderBrush="{StaticResource ColorPickerDarkBorderBrush}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                <ScrollViewer x:Name="DropDownScrollViewer"
-                              VerticalScrollBarVisibility="Auto">
-                  <ContentPresenter x:Name="PART_ContentPresenter"
-                                    Content="{TemplateBinding DropDownContent}" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
deleted file mode 100644
index a452b362..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Converters
-{
-  public class StyleableWindowClippingBorderConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      double borderThickness = (double)value;
-      return new Thickness( borderThickness, borderThickness, borderThickness, borderThickness * 2);
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
deleted file mode 100644
index bee48674..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:core="clr-namespace:Xceed.Wpf.Toolkit.Core">
-
-   <ResourceDictionary.MergedDictionaries>
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Themes/Aero/Brushes_NormalColor.xaml"/>
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit"
-                                      SourcePath="Themes/Aero/Buttons_NormalColor.xaml"/>
-   </ResourceDictionary.MergedDictionaries>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
deleted file mode 100644
index 61e2a4a9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes" >
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBackgroundKey}" 
-                    Color="#FFFFFF" options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlDisabledBackgroundKey}" 
-                    Color="#F4F4F4" options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBorderKey}" 
-                        StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FFabadb3" Offset="0" />
-            <GradientStop Color="#FFdbdfe6" Offset="0.05000000074505806" />
-            <GradientStop Color="#FFdbdfe6" Offset="0.949999988079071" />
-            <GradientStop Color="#FFe3e9ef" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlMouseOverBorderKey}" 
-                        StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FF3d7bad" Offset="0" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-            <GradientStop Color="#FFb7d9ed" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlFocusedBorderKey}" 
-                        StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FF3d7bad" Offset="0" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-            <GradientStop Color="#FFb7d9ed" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalOuterBorderKey}"
-                    options:Freeze="true"
-                    Color="#FFABADB3" />
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalInnerBorderKey}" 
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFfcfcfc" />
-            <GradientStop Offset="0.5" Color="#FFf9f9f9" />
-            <GradientStop Offset="0.5" Color="#FFf3f3f3" />
-            <GradientStop Offset="1" Color="#FFf3f3f3" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalBackgroundKey}"
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFf2f2f2" />
-            <GradientStop Offset="0.5" Color="#FFe8e8e8" />
-            <GradientStop Offset="0.5" Color="#FFd1d1d1" />
-            <GradientStop Offset="1" Color="#FFd1d1d1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverOuterBorderKey}"
-                    options:Freeze="true"
-                    Color="#FF3C7FB1" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverInnerBorderKey}"
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FFfafdfe" Offset="0" />
-            <GradientStop Color="#FFf5fbfe" Offset="0.5" />
-            <GradientStop Color="#FFeff9fe" Offset="0.5009999871253967" />
-            <GradientStop Color="#FFe8f5fc" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverBackgroundKey}"
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FFeaf6fd" Offset="0" />
-            <GradientStop Color="#FFd9f0fc" Offset="0.5" />
-            <GradientStop Color="#FFbee6fd" Offset="0.5009999871253967" />
-            <GradientStop Color="#FFa7d9f5" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedOuterBorderKey}"
-                    options:Freeze="true"
-                    Color="#FF2C628B" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedInnerBorderKey}"
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FF9eb0ba" Offset="0" />
-            <GradientStop Color="#FF9abacb" Offset="0.5" />
-            <GradientStop Color="#FF78aac5" Offset="0.5008999705314636" />
-            <GradientStop Color="#FF5a96b8" Offset="0.8999999761581421" />
-            <GradientStop Color="#FF68b2da" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedBackgroundKey}"
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FFe5f4fc" Offset="0" />
-            <GradientStop Color="#FFc4e5f6" Offset="0.5" />
-            <GradientStop Color="#FF98d1ef" Offset="0.5009999871253967" />
-            <GradientStop Color="#FF68b3db" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedOuterBorderKey}" 
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FF3d7bad" Offset="0" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-            <GradientStop Color="#FFb7d9ed" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
deleted file mode 100644
index 124da4c7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
-
-   <Style x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=SpinnerButtonStyleKey}" 
-          TargetType="RepeatButton">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="BorderBrush" Value="Transparent" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Padding" Value="2,2" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="RepeatButton">
-               <Grid>
-                  <chrome:ButtonChrome x:Name="Chrome"
-                                       BorderBrush="{TemplateBinding BorderBrush}" 
-                                       Background="{TemplateBinding Background}"                                                                  
-                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
-                                       RenderEnabled="{TemplateBinding IsEnabled}"
-                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                       RenderNormal="False"
-                                       RenderPressed="{TemplateBinding IsPressed}"
-                                       SnapsToDevicePixels="true" />
-
-                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Margin="{TemplateBinding Padding}" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index e9ff8926..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Themes/Aero2/Brushes.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Themes/Aero2/Buttons.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Themes/Aero2/Common.xaml" />
-
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Chromes/Themes/Aero2.NormalColor.xaml" />
-
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/BusyIndicator/Themes/Aero2.NormalColor.xaml" />
-
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ButtonSpinner/Themes/Aero2.NormalColor.xaml" />
-
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Calculator/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CalculatorUpDown/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Primitives/Themes/Aero2/WindowControl.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Primitives/Themes/Aero2/SelectorItem.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckComboBox/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckListBox/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ChildWindow/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CollectionControl/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ColorCanvas/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ColorPicker/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DropDownButton/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/IconButton/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/MessageBox/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DateTimeUpDown/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DateTimePicker/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/NumericUpDown/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Pie/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/RangeSlider/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/SplitButton/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/PropertyGrid/Themes/Aero2.NormalColor.xaml" />
-
-
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/TimePicker/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/WatermarkComboBox/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/WatermarkTextBox/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Wizard/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Zoombox/Themes/Aero2.NormalColor.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
deleted file mode 100644
index a0531d31..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-
-   <!-- Control -->
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBackgroundKey}"
-                    Color="#FFFFFFFF"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlDisabledBackgroundKey}"
-                    Color="#FFF4F4F4"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBorderKey}"
-                    Color="#FFABADB3"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlMouseOverBorderKey}"
-                    Color="#FF7EB4EA"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlSelectedBorderKey}"
-                    Color="#FF569DE5"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlFocusedBorderKey}"
-                    Color="Red"
-                    options:Freeze="true" />
-
-   <!-- Button -->
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalOuterBorderKey}"
-                    Color="#FF707070"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalBackgroundKey}"
-                    Color="#FFDDDDDD"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverOuterBorderKey}"
-                    Color="#FF3C7FB1"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverBackgroundKey}"
-                    Color="#FFBEE6FD"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedOuterBorderKey}"
-                    Color="#FF2C628B"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedBackgroundKey}"
-                    Color="#FFC4E5F6"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedOuterBorderKey}"
-                    Color="Red"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedBackgroundKey}"
-                    Color="Orange"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonDisabledOuterBorderKey}"
-                    Color="#FFADB2B5"
-                    options:Freeze="true" />
-
-   <!-- Up/Down Glyphs -->
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphNormalForegroundKey}"
-                    Color="#FF000000" />
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphDisabledForegroundKey}"
-                    Color="#FFA9A9A9" />
-
-   <!-- SpinButton CornerRadius -->
-   <CornerRadius x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=SpinButtonCornerRadiusKey}"
-                 TopLeft="0"
-                 TopRight="0"
-                 BottomRight="0"
-                 BottomLeft="0"
-                 options:Freeze="true" />
-
-
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
deleted file mode 100644
index ec195aa7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
-
-    <Style x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=SpinnerButtonStyleKey}" 
-           TargetType="RepeatButton">
-        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Padding" Value="2,2" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RepeatButton">
-                    <Grid>
-                        <chrome:ButtonChrome x:Name="Chrome"
-                                       BorderBrush="{TemplateBinding BorderBrush}" 
-                                       Background="{TemplateBinding Background}"                                                                  
-                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
-                                       RenderEnabled="{TemplateBinding IsEnabled}"
-                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                       RenderNormal="True"
-                                       RenderPressed="{TemplateBinding IsPressed}"
-                                       SnapsToDevicePixels="true" />
-
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Margin="{TemplateBinding Padding}" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
deleted file mode 100644
index 0d24459a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:s="clr-namespace:System;assembly=mscorlib"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:media="clr-namespace:Xceed.Wpf.Toolkit.Core.Media"
-                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
-
-    <!-- =============================================================================== -->
-    <!-- Geometry for Close/Minimize/Maximize buttons                                    -->
-    <!-- =============================================================================== -->
-    <Geometry x:Key="closeGeometry">
-        M1,0 L0,1 3,4 0,7 1,8 2,8 2,7 4,5 7,8 8,8 8,7 5,4 8,1 7,0 5,2 5,3 4,3 1,0
-    </Geometry>
-    <Geometry x:Key="toolWindowCloseGeometry">
-        M0,0 L0,1 2,1 2,3 4,3 4,6 2,6 2,8 0,8 0,9 3,9 3,7 6,7 6,9 9,9 9,8 7,8 7,6 5,6 5,3 7,3 7,1 9,1 9,0 6,0 6,2 3,2 3,0 z
-    </Geometry>
-    <Geometry x:Key="minimizeGeometry">
-        M0,0 L8,0 8,1 8,2 0,2 0,1 z
-    </Geometry>
-    <Geometry x:Key="maximizeGeometry">
-        M0,0 L8,0 8,1 0,1 z M0,0 L8,0 8,8 0,8 z
-    </Geometry>
-
-
-    <!-- =============================================================================== -->
-    <!-- Common Styles                                                                   -->
-   <!-- Need to find a way to share these for WindowControl and StyleableWindow          -->
-    <!-- =============================================================================== -->
-
-    <!-- ResizeGrip -->
-    <ImageBrush x:Key="resize_grip"
-                ImageSource="../Generic/Images/resize_grip.png" />
-
-    <!-- New Button Template without MouseOver and Pressed triggers -->
-    <ControlTemplate x:Key="WindowButtonTemplate" TargetType="Button">
-        <Border Name="border" 
-                Padding="1" 
-                BorderThickness="0"
-                Background="{TemplateBinding Background}">
-            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
-        </Border>
-    </ControlTemplate>
-
-    <!--Default Close button style-->
-   <Style x:Key="{ComponentResourceKey 
-                  TypeInTargetAssembly={x:Type primitives:WindowControl}, 
-                  ResourceId=DefaultCloseButtonStyle}" TargetType="Button" >
-        <Setter Property="Background" Value="#FFC75050" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template" Value="{StaticResource WindowButtonTemplate}" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False">
-                <Setter Property="Background" Value="#FFBCBCBC" />
-            </DataTrigger>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="#FFE04343" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="#FF993D3D" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-
-
-
-    <SolidColorBrush x:Key="Window_WindowBorderBrush" Color="Gray" />
-
-    <SolidColorBrush x:Key="Window_WindowBackground" Color="{x:Static media:WindowColors.ColorizationColor}" />
-
-    <SolidColorBrush x:Key="Window_Background"  Color="White"/>
-
-    <SolidColorBrush x:Key="Window_WindowInactiveBackground" Color="#FFEBEBEB" />
-
-    <SolidColorBrush x:Key="Window_CaptionForeground" Color="Black"/>
-
-    <SolidColorBrush x:Key="Window_CaptionShadowBrush" Color="Transparent" />
-
-    <s:Double x:Key="Window_CaptionFontSize">15</s:Double>
-
-    <Thickness x:Key="Window_WindowBorderThickness">1</Thickness>
-
-    <!-- Panel Background -->
-    <LinearGradientBrush x:Key="PanelBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFF0F0F0" />
-                <GradientStop Offset="1" Color="#FFE5E5E5" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <!-- Popup Background -->
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFF0F0F0" />
-                <GradientStop Offset="1" Color="#FFE5E5E5" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <!-- Popup Border -->
-    <SolidColorBrush x:Key="PopupDarkBorderBrush" Color="#FFABADB3" />
-
-
-    <!-- =============================================================================== -->
-    <!-- ColorCanvas, ColorPicker                                                        -->
-    <!-- =============================================================================== -->
-
-    <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
-        <DrawingBrush.Drawing>
-            <DrawingGroup>
-                <GeometryDrawing Brush="White">
-                    <GeometryDrawing.Geometry>
-                        <RectangleGeometry Rect="0,0 100,100" />
-                    </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-                <GeometryDrawing Brush="LightGray">
-                    <GeometryDrawing.Geometry>
-                        <GeometryGroup>
-                            <RectangleGeometry Rect="0,0 50,50" />
-                            <RectangleGeometry Rect="50,50 50,50" />
-                        </GeometryGroup>
-                    </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-            </DrawingGroup>
-        </DrawingBrush.Drawing>
-    </DrawingBrush>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
deleted file mode 100644
index 1f8f2b00..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-   <Geometry x:Key="UpArrowGeometry">M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z</Geometry>
-   <Geometry x:Key="DownArrowGeometry">M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z</Geometry>
-
-   <DataTemplate x:Key="IncreaseGlyphNormalKey">
-        <Path Width="9"
-            Height="5"
-            Data="{StaticResource UpArrowGeometry}"
-            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
-            SnapsToDevicePixels="True"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Focusable="False" />
-    </DataTemplate>
-    <DataTemplate x:Key="IncreaseGlyphDisabledKey">
-        <Path	Width="9"
-            Height="5"
-            Data="{StaticResource UpArrowGeometry}"
-            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
-            SnapsToDevicePixels="True"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Focusable="False" />
-    </DataTemplate>
-
-    <DataTemplate x:Key="DecreaseGlyphNormalKey">
-        <Path Width="9"
-            Height="5"
-            Data="{StaticResource DownArrowGeometry}"
-            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
-            SnapsToDevicePixels="True"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Focusable="False" />
-    </DataTemplate>
-
-    <DataTemplate x:Key="DecreaseGlyphDisabledKey">
-        <Path	Width="9"
-            Height="5"
-            Data="{StaticResource DownArrowGeometry}"
-            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
-            SnapsToDevicePixels="True"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Focusable="False" />
-    </DataTemplate>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
deleted file mode 100644
index 0477349a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:core="clr-namespace:Xceed.Wpf.Toolkit.Core">
-   <ResourceDictionary.MergedDictionaries>
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Themes/Generic/Brushes.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Themes/Generic/Buttons.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Themes/Generic/Common.xaml" />
-
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Chromes/Themes/Generic.xaml" />
-
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="BusyIndicator/Themes/Generic.xaml" />
-
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ButtonSpinner/Themes/Generic.xaml" />
-
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Calculator/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CalculatorUpDown/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Primitives/Themes/Generic/WindowControl.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Primitives/Themes/Generic/SelectorItem.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CheckComboBox/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CheckListBox/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ChildWindow/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CollectionControl/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ColorCanvas/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ColorPicker/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DropDownButton/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="IconButton/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Magnifier/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="MessageBox/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DateTimeUpDown/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DateTimePicker/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="MultiLineTextEditor/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="NumericUpDown/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Pie/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="RangeSlider/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="SplitButton/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="PropertyGrid/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="RichTextBoxFormatBar/Themes/Generic.xaml" />
-
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="TimePicker/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="TimeSpanUpDown/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="WatermarkComboBox/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="WatermarkTextBox/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Wizard/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Zoombox/Themes/Generic.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
deleted file mode 100644
index 07fe1414..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
+++ /dev/null
@@ -1,216 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBackgroundKey}"
-                    Color="#FFFFFFFF"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlDisabledBackgroundKey}"
-                    Color="#F4F4F4"
-                    options:Freeze="true" />
-
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBorderKey}"
-                        EndPoint="0,20"
-                        MappingMode="Absolute"
-                        StartPoint="0,0"
-                        options:Freeze="true">
-      <GradientStop Color="#ABADB3"
-                    Offset="0.05" />
-      <GradientStop Color="#E2E3EA"
-                    Offset="0.07" />
-      <GradientStop Color="#E3E9EF"
-                    Offset="1" />
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlMouseOverBorderKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1"
-                        options:Freeze="true">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#5794BF"
-                          Offset="0.05" />
-            <GradientStop Color="#B7D5EA"
-                          Offset="0.07" />
-            <GradientStop Color="#C7E2F1"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlFocusedBorderKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1"
-                        options:Freeze="true">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#3D7BAD"
-                          Offset="0.05" />
-            <GradientStop Color="#A4C9E3"
-                          Offset="0.07" />
-            <GradientStop Color="#B7D9ED"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalOuterBorderKey}"
-                    Color="#FF707070"
-                    options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalInnerBorderKey}"
-                        EndPoint="0,1"
-                        StartPoint="0,0"
-                        options:Freeze="true">
-      <GradientStop Color="#FAFFFFFF"
-                    Offset="0" />
-      <GradientStop Color="#85FFFFFF"
-                    Offset="1" />
-   </LinearGradientBrush>
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalBackgroundKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#F3F3F3"
-                          Offset="0" />
-            <GradientStop Color="#EBEBEB"
-                          Offset="0.5" />
-            <GradientStop Color="#DDDDDD"
-                          Offset="0.5" />
-            <GradientStop Color="#CDCDCD"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverOuterBorderKey}"
-                    Color="#3C7FB1" />
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverInnerBorderKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FAFFFFFF"
-                          Offset="0" />
-            <GradientStop Color="#85FFFFFF"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverBackgroundKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FFEAF6FD"
-                          Offset="0" />
-            <GradientStop Color="#FFD9F0FC"
-                          Offset="0.50" />
-            <GradientStop Color="#FFBEE6FD"
-                          Offset="0.50" />
-            <GradientStop Color="#FFA7D9F5"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedOuterBorderKey}"
-                    Color="#2C628B" />
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedInnerBorderKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FAFFFFFF"
-                          Offset="0" />
-            <GradientStop Color="#85FFFFFF"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedBackgroundKey}"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#C2E4F6"
-                          Offset="0.5" />
-            <GradientStop Color="#ABDAF3"
-                          Offset="0.5" />
-            <GradientStop Color="#90CBEB"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedOuterBorderKey}"
-                    Color="#FF707070"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedInnerBorderKey}"
-                    Color="#F900CCFF"
-                    options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedBackgroundKey}"
-                        EndPoint="0,1"
-                        StartPoint="0,0"
-                        options:Freeze="true">
-      <GradientStop Color="#FFEAF6FD"
-                    Offset="0" />
-      <GradientStop Color="#FFD9F0FC"
-                    Offset="0.50" />
-      <GradientStop Color="#FFBEE6FD"
-                    Offset="0.50" />
-      <GradientStop Color="#FFA7D9F5"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonDisabledOuterBorderKey}"
-                    Color="#ADB2B5"
-                    options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonInnerBorderDisabledKey}"
-                        EndPoint="0,1"
-                        StartPoint="0,0"
-                        options:Freeze="true">
-      <GradientStop Color="#FAFFFFFF"
-                    Offset="0" />
-      <GradientStop Color="#85FFFFFF"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphNormalForegroundKey}"
-                    Color="#FF000000" />
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphDisabledForegroundKey}"
-                    Color="#A9A9A9" />
-
-   <CornerRadius x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=SpinButtonCornerRadiusKey}"
-                 TopLeft="0"
-                 TopRight="0"
-                 BottomRight="0"
-                 BottomLeft="0"
-                 options:Freeze="true" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
deleted file mode 100644
index f236d736..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
-
-   <Style x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=SpinnerButtonStyleKey}" 
-          TargetType="RepeatButton">
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Padding" Value="2,2" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="RepeatButton">
-               <Grid>
-                  <chrome:ButtonChrome x:Name="Chrome"
-                                       BorderBrush="{TemplateBinding BorderBrush}" 
-                                       Background="{TemplateBinding Background}"                                                                  
-                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
-                                       RenderEnabled="{TemplateBinding IsEnabled}"
-                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                       RenderNormal="True"
-                                       RenderPressed="{TemplateBinding IsPressed}"
-                                       SnapsToDevicePixels="true" />
-
-                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Margin="{TemplateBinding Padding}" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
deleted file mode 100644
index 1ad04e9e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
+++ /dev/null
@@ -1,233 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:media="clr-namespace:Xceed.Wpf.Toolkit.Core.Media"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:s="clr-namespace:System;assembly=mscorlib">
-
-
-    <!-- =============================================================================== -->
-    <!-- Images for the buttons and their various states                                 -->
-    <!-- =============================================================================== -->
-
-    <!-- ResizeGrip -->
-    <ImageBrush x:Key="resize_grip" 
-                ImageSource="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/resize_grip.png" />
-
-   <Style x:Key="buttonImageStyle" TargetType="Image">
-      <Setter Property="Stretch" Value="None" />
-      <Setter Property="RenderOptions.EdgeMode" Value="Aliased" />
-      <Setter Property="RenderOptions.BitmapScalingMode" Value="NearestNeighbor" />
-   </Style>
-
-    <!-- Minimize -->
-   <BitmapImage x:Key="minimize_normal"
-                UriSource="Images/minimize_normal.png" />
-   <BitmapImage x:Key="minimize_hover"
-                UriSource="Images/minimize_hover.png" />
-   <BitmapImage x:Key="minimize_pressed"
-                UriSource="Images/minimize_pressed.png" />
-   <BitmapImage x:Key="minimize_inactive"
-                UriSource="Images/minimize_inactive.png" />
-
-    <!-- Maximize -->
-   <BitmapImage x:Key="maximize_normal"
-                UriSource="Images/maximize_normal.png" />
-   <BitmapImage x:Key="maximize_hover"
-                UriSource="Images/maximize_hover.png" />
-   <BitmapImage x:Key="maximize_pressed"
-                UriSource="Images/maximize_pressed.png" />
-   <BitmapImage x:Key="maximize_inactive"
-                UriSource="Images/maximize_inactive.png" />
-   <BitmapImage x:Key="maximize_disabled"
-                UriSource="Images/maximize_disabled.png" />
-
-    <!-- Restore -->
-   <BitmapImage x:Key="restore_normal"
-                UriSource="Images/restore_normal.png" />
-   <BitmapImage x:Key="restore_hover"
-                UriSource="Images/restore_hover.png" />
-   <BitmapImage x:Key="restore_pressed"
-                UriSource="Images/restore_pressed.png" />
-   <BitmapImage x:Key="restore_inactive"
-                UriSource="Images/restore_inactive.png" />
-   <BitmapImage x:Key="restore_disabled"
-                UriSource="Images/restore_disabled.png" />
-
-    <!-- Close -->
-   <BitmapImage  x:Key="close_normal"
-                 UriSource="Images/close_normal.png" />
-   <BitmapImage  x:Key="close_hover"
-                 UriSource="Images/close_hover.png" />
-   <BitmapImage  x:Key="close_pressed"
-                 UriSource="Images/close_pressed.png" />
-   <BitmapImage  x:Key="close_inactive"
-                 UriSource="Images/close_inactive.png" />
-
-    <!-- Close (with 2 rounded corners) -->
-   <BitmapImage x:Key="close_rounded_normal"
-                UriSource="Images/close_rounded_normal.png" />
-   <BitmapImage x:Key="close_rounded_hover"
-                UriSource="Images/close_rounded_hover.png" />
-   <BitmapImage x:Key="close_rounded_pressed"
-                UriSource="Images/close_rounded_pressed.png" />
-   <BitmapImage x:Key="close_rounded_inactive"
-                UriSource="Images/close_rounded_inactive.png" />
-
-    <!-- Close (for ToolWindow) -->
-   <BitmapImage x:Key="close_toolwindow_normal"
-                UriSource="Images/close_toolwindow_normal.png" />
-   <BitmapImage x:Key="close_toolwindow_hover"
-                UriSource="Images/close_toolwindow_hover.png" />
-   <BitmapImage x:Key="close_toolwindow_pressed"
-                UriSource="Images/close_toolwindow_pressed.png" />
-   <BitmapImage x:Key="close_toolwindow_inactive"
-                UriSource="Images/close_toolwindow_inactive.png" />
-
-
-    <!-- =============================================================================== -->
-    <!-- Common Styles                                                                   -->
-   <!-- Need to find a way to share these for WindowControl and StyleableWindow          -->
-    <!-- =============================================================================== -->
-
-    <!-- Button template -->
-    <ControlTemplate x:Key="buttonTemplate" TargetType="Button">
-        <Border Name="outerBorder" 
-                Background="{TemplateBinding Background}" 
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
-            <Image Source="{TemplateBinding Content}" Style="{StaticResource buttonImageStyle}"/>
-        </Border>
-    </ControlTemplate>
-
-   <Style x:Key="windowButtonBaseStyle" TargetType="Button">
-      <Setter Property="IsTabStop" Value="False" />
-      <Setter Property="Margin" Value="0,-1,0,0" />
-      <Setter Property="OverridesDefaultStyle" Value="True" />
-      <Setter Property="Template" Value="{StaticResource buttonTemplate}" />
-   </Style>
-
-    <!--Default Close button style-->
-   <Style x:Key="{ComponentResourceKey 
-                  TypeInTargetAssembly={x:Type primitives:WindowControl}, 
-                  ResourceId=DefaultCloseButtonStyle}"
-           TargetType="Button" 
-          BasedOn="{StaticResource windowButtonBaseStyle}">
-      <Setter Property="ToolTip" Value="Close" />
-      <Setter Property="Content" Value="{StaticResource close_normal}" />
-        <Style.Triggers>
-            <!-- Regular Window -->
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False">
-                <Setter Property="Content" Value="{StaticResource close_inactive}" />
-            </DataTrigger>
-            <Trigger Property="IsMouseOver" Value="True">
-            <Setter Property="Content" Value="{StaticResource close_hover}" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-            <Setter Property="Content" Value="{StaticResource close_pressed}" />
-            </Trigger>
-
-            <!-- NoResize (Close button with 2 rounded corners) -->
-
-            <!-- Tool Window -->
-            <Trigger Property="Name" Value="PART_ToolWindowCloseButton">
-            <Setter Property="Content" Value="{StaticResource close_toolwindow_normal}" />
-            </Trigger>
-            <MultiDataTrigger>
-                <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding RelativeSource={RelativeSource self},Path=Name}" Value="PART_ToolWindowCloseButton" />
-                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False" />
-                </MultiDataTrigger.Conditions>
-            <Setter Property="Content" Value="{StaticResource close_toolwindow_inactive}" />
-            </MultiDataTrigger>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="Name" Value="PART_ToolWindowCloseButton" />
-                    <Condition Property="IsMouseOver" Value="True" />
-                </MultiTrigger.Conditions>
-            <Setter Property="Content" Value="{StaticResource close_toolwindow_hover}" />
-            </MultiTrigger>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="Name" Value="PART_ToolWindowCloseButton" />
-                    <Condition Property="IsPressed" Value="True" />
-                </MultiTrigger.Conditions>
-            <Setter Property="Content" Value="{StaticResource close_toolwindow_pressed}" />
-            </MultiTrigger>
-
-        </Style.Triggers>
-    </Style>
-
-
-
-
-
-
-   <SolidColorBrush x:Key="Window_WindowBorderBrush" Color="#FF252C33" />
-
-   <conv:ColorBlendConverter x:Key="Window_WindowBackground_converter" BlendedColor="#FFA0A0A0" BlendedColorRatio="0.35" />
-   <SolidColorBrush x:Key="Window_WindowBackground" 
-                    Color="{Binding 
-                        Source={x:Static media:WindowColors.ColorizationColor}, 
-                        Converter={StaticResource Window_WindowBackground_converter}}" 
-                    Opacity="0.85"/>
-
-   <SolidColorBrush x:Key="Window_Background"  Color="White"/>
-
-   <SolidColorBrush x:Key="Window_BorderBrush" Color="#5D6C7A" />
-
-   <s:Double x:Key="Window_CaptionFontSize">15</s:Double>
-
-   <Thickness x:Key="Window_BorderThickness" Left="1" Right="1" Bottom="1" Top="1" />
-
-   <conv:ColorBlendConverter x:Key="Window_WindowInactiveBackground_converter" BlendedColor="#FFF0F0F0" BlendedColorRatio="0.67" />
-   <SolidColorBrush x:Key="Window_WindowInactiveBackground" 
-                    Color="{Binding 
-                        Source={x:Static media:WindowColors.ColorizationColor}, 
-                        Converter={StaticResource Window_WindowInactiveBackground_converter}}" 
-                    Opacity="0.85"/>
-
-   <SolidColorBrush x:Key="Window_CaptionForeground" Color="Black"/>
-
-   <Thickness x:Key="Window_WindowBorderThickness">1</Thickness>
-
-   <!-- ========================================================================= -->
-   <!-- Used by ColorPicker and ColorCanvas                                       -->
-   <!-- ========================================================================= -->
-   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
-      <DrawingBrush.Drawing>
-         <DrawingGroup>
-            <GeometryDrawing Brush="White">
-               <GeometryDrawing.Geometry>
-                  <RectangleGeometry Rect="0,0 100,100" />
-               </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-            <GeometryDrawing Brush="LightGray">
-               <GeometryDrawing.Geometry>
-                  <GeometryGroup>
-                     <RectangleGeometry Rect="0,0 50,50" />
-                     <RectangleGeometry Rect="50,50 50,50" />
-                  </GeometryGroup>
-               </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-         </DrawingGroup>
-      </DrawingBrush.Drawing>
-   </DrawingBrush>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
deleted file mode 100644
index 166236e8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-   <Geometry x:Key="UpArrowGeometry">M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z</Geometry>
-   <Geometry x:Key="DownArrowGeometry">M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z</Geometry>
-
-   <DataTemplate x:Key="IncreaseGlyphNormalKey">
-      <Path Width="9"
-            Height="5"
-            Data="{StaticResource UpArrowGeometry}"
-            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
-            SnapsToDevicePixels="True"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Focusable="False" />
-   </DataTemplate>
-   <DataTemplate x:Key="IncreaseGlyphDisabledKey">
-      <Path	Width="9"
-            Height="5"
-            Data="{StaticResource UpArrowGeometry}"
-            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
-            SnapsToDevicePixels="True"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Focusable="False" />
-   </DataTemplate>
-
-   <DataTemplate x:Key="DecreaseGlyphNormalKey">
-      <Path Width="9"
-            Height="5"
-            Data="{StaticResource DownArrowGeometry}"
-            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
-            SnapsToDevicePixels="True"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Focusable="False" />
-   </DataTemplate>
-
-   <DataTemplate x:Key="DecreaseGlyphDisabledKey">
-      <Path	Width="9"
-            Height="5"
-            Data="{StaticResource DownArrowGeometry}"
-            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
-            SnapsToDevicePixels="True"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Focusable="False" />
-   </DataTemplate>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png
deleted file mode 100644
index 3fe5c919..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png
deleted file mode 100644
index 1b461928..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png
deleted file mode 100644
index d7fcb801..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png
deleted file mode 100644
index e406e334..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png
deleted file mode 100644
index a8ef093a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png
deleted file mode 100644
index fac35369..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png
deleted file mode 100644
index 7d8fede6..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png
deleted file mode 100644
index 0ee5dfbd..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png
deleted file mode 100644
index 9a2987ec..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png
deleted file mode 100644
index 4f977353..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png
deleted file mode 100644
index bf066962..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png
deleted file mode 100644
index 1c3d9a5e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png
deleted file mode 100644
index d9805399..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png
deleted file mode 100644
index 4715f7d6..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png
deleted file mode 100644
index 3755d81a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png
deleted file mode 100644
index 713a1a2f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png
deleted file mode 100644
index ec5d431b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png
deleted file mode 100644
index c4c0496c..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png
deleted file mode 100644
index 204ea5cc..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png
deleted file mode 100644
index 64870392..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png
deleted file mode 100644
index 3ab1ec5e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png
deleted file mode 100644
index 8a085971..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png
deleted file mode 100644
index 1683f61d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png
deleted file mode 100644
index 9f1a27e5..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png
deleted file mode 100644
index da3f7787..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png
deleted file mode 100644
index 595eb1fe..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png
deleted file mode 100644
index c94c7016..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-   <!-- 
-        This theme is not supported. All resource lookups will fall back on the content
-        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
-        hopfully resolve the following issues reported by the community:
-        Issue 19517
-        Issue 18971
-   -->
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-   <!-- 
-        This theme is not supported. All resource lookups will fall back on the content
-        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
-        hopfully resolve the following issues reported by the community:
-        Issue 19517
-        Issue 18971
-   -->
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
deleted file mode 100644
index 6d617a30..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-   <!-- 
-        This theme is not supported. All resource lookups will fall back on the content
-        of Generic.xaml (Aero-based). This ResourceDictionary was inserted in order to 
-        hopfully resolve the following issues reported by the community:
-        Issue 19517
-        Issue 18971
-   -->
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-   <!-- 
-        This theme is not supported. All resource lookups will fall back on the content
-        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
-        hopfully resolve the following issues reported by the community:
-        Issue 19517
-        Issue 18971
-   -->
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-   <!-- 
-        This theme is not supported. All resource lookups will fall back on the content
-        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
-        hopfully resolve the following issues reported by the community:
-        Issue 19517
-        Issue 18971
-   -->
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
deleted file mode 100644
index b7baac60..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class TimeItem
-  {
-    public string Display
-    {
-      get;
-      set;
-    }
-    public TimeSpan Time
-    {
-      get;
-      set;
-    }
-
-    public TimeItem( string display, TimeSpan time )
-    {
-      Display = display;
-      Time = time;
-    }
-
-    #region Base Class Overrides
-
-    public override bool Equals( object obj )
-    {
-      var item = obj as TimeItem;
-      if( item != null )
-        return Time == item.Time;
-      else
-        return false;
-    }
-
-    public override int GetHashCode()
-    {
-      return Time.GetHashCode();
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
deleted file mode 100644
index 41532b30..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
+++ /dev/null
@@ -1,532 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Collections.Generic;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_TimeListItems, Type = typeof( ListBox ) )]
-  public class TimePicker : DateTimePickerBase
-  {
-    private const string PART_TimeListItems = "PART_TimeListItems";
-
-    #region Members
-
-    private ListBox _timeListBox;
-    private bool _isListBoxInvalid = true;
-    internal static readonly TimeSpan EndTimeDefaultValue = new TimeSpan( 23, 59, 0 );
-    internal static readonly TimeSpan StartTimeDefaultValue = new TimeSpan( 0, 0, 0 );
-    internal static readonly TimeSpan TimeIntervalDefaultValue = new TimeSpan( 1, 0, 0 );
-
-    #endregion //Members
-
-    #region Properties
-
-    #region EndTime
-
-    public static readonly DependencyProperty EndTimeProperty = DependencyProperty.Register( "EndTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( EndTimeDefaultValue, new PropertyChangedCallback( OnEndTimeChanged ), new CoerceValueCallback( OnCoerceEndTime ) ) );
-
-    private static object OnCoerceEndTime( DependencyObject o, object value )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        return timePicker.OnCoerceEndTime( ( TimeSpan )value );
-      else
-        return value;
-    }
-
-    private static void OnEndTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnEndTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
-    }
-
-    protected virtual TimeSpan OnCoerceEndTime( TimeSpan value )
-    {
-      ValidateTime( value );
-      return value;
-    }
-
-    protected virtual void OnEndTimeChanged( TimeSpan oldValue, TimeSpan newValue )
-    {
-      InvalidateListBoxItems();
-    }
-
-    public TimeSpan EndTime
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( EndTimeProperty );
-      }
-      set
-      {
-        SetValue( EndTimeProperty, value );
-      }
-    }
-
-    #endregion //EndTime
-
-    #region Format
-
-    protected override void OnFormatChanged( DateTimeFormat oldValue, DateTimeFormat newValue )
-    {
-      base.OnFormatChanged( oldValue, newValue );
-      InvalidateListBoxItems();
-    }
-
-    #endregion //Format
-
-    #region MaxDropDownHeight
-
-    public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register( "MaxDropDownHeight", typeof( double ), typeof( TimePicker ), new UIPropertyMetadata( 130d, OnMaxDropDownHeightChanged ) );
-    public double MaxDropDownHeight
-    {
-      get
-      {
-        return ( double )GetValue( MaxDropDownHeightProperty );
-      }
-      set
-      {
-        SetValue( MaxDropDownHeightProperty, value );
-      }
-    }
-
-    private static void OnMaxDropDownHeightChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnMaxDropDownHeightChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    protected virtual void OnMaxDropDownHeightChanged( double oldValue, double newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion
-
-    #region StartTime
-
-    public static readonly DependencyProperty StartTimeProperty = DependencyProperty.Register( "StartTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( StartTimeDefaultValue, new PropertyChangedCallback( OnStartTimeChanged ), new CoerceValueCallback( OnCoerceStartTime ) ) );
-
-    private static object OnCoerceStartTime( DependencyObject o, object value )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        return timePicker.OnCoerceStartTime( ( TimeSpan )value );
-      else
-        return value;
-    }
-
-    private static void OnStartTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnStartTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
-    }
-
-    protected virtual TimeSpan OnCoerceStartTime( TimeSpan value )
-    {
-      ValidateTime( value );
-      return value;
-    }
-
-    protected virtual void OnStartTimeChanged( TimeSpan oldValue, TimeSpan newValue )
-    {
-      InvalidateListBoxItems();
-    }
-
-    public TimeSpan StartTime
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( StartTimeProperty );
-      }
-      set
-      {
-        SetValue( StartTimeProperty, value );
-      }
-    }
-
-
-    #endregion //StartTime
-
-    #region TimeInterval
-
-    public static readonly DependencyProperty TimeIntervalProperty = DependencyProperty.Register( "TimeInterval", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( TimeIntervalDefaultValue, OnTimeIntervalChanged ) );
-    public TimeSpan TimeInterval
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( TimeIntervalProperty );
-      }
-      set
-      {
-        SetValue( TimeIntervalProperty, value );
-      }
-    }
-
-    private static object OnCoerceTimeInterval( DependencyObject o, object value )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        return timePicker.OnCoerceTimeInterval( ( TimeSpan )value );
-      else
-        return value;
-    }
-
-    private static void OnTimeIntervalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnTimeIntervalChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
-    }
-
-    protected virtual TimeSpan OnCoerceTimeInterval( TimeSpan value )
-    {
-      ValidateTime( value );
-
-      if( value.Ticks == 0L )
-        throw new ArgumentException( "TimeInterval must be greater than zero" );
-
-      return value;
-    }
-
-
-    protected virtual void OnTimeIntervalChanged( TimeSpan oldValue, TimeSpan newValue )
-    {
-      InvalidateListBoxItems();
-    }
-
-    #endregion //TimeInterval
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static TimePicker()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimePicker ), new FrameworkPropertyMetadata( typeof( TimePicker ) ) );
-      FormatProperty.OverrideMetadata( typeof( TimePicker ), new UIPropertyMetadata( DateTimeFormat.ShortTime ) );
-      UpdateValueOnEnterKeyProperty.OverrideMetadata( typeof( TimePicker ), new FrameworkPropertyMetadata( true ) );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override void OnFormatStringChanged( string oldValue, string newValue )
-    {
-      if( this.Format == DateTimeFormat.Custom )
-      {
-        InvalidateListBoxItems();
-      }
-      base.OnFormatStringChanged( oldValue, newValue );
-    }
-
-    protected override void OnMaximumChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnMaximumChanged( oldValue, newValue );
-      this.InvalidateListBoxItems();
-    }
-
-
-    protected override void OnMinimumChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnMinimumChanged( oldValue, newValue );
-      this.InvalidateListBoxItems();
-    }
-
-    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-
-      // ListBox content may be affected if value's date changed and the date was
-      // or is equal to Minimum or Maximum value.
-      bool invalidate = false;
-
-      if( DateTimeUtilities.IsSameDate( this.Minimum, oldValue )
-        != DateTimeUtilities.IsSameDate( this.Minimum, newValue ) )
-      {
-        invalidate = true;
-      }
-
-      if( DateTimeUtilities.IsSameDate( this.Maximum, oldValue )
-        != DateTimeUtilities.IsSameDate( this.Maximum, newValue ) )
-      {
-        invalidate = true;
-      }
-
-      // A value change can affect the display of the listbox items
-      // if the Date part of the value has changed. This is the case when
-      // the display text of the items contains part of the Date values.
-      if( oldValue.GetValueOrDefault().Date != newValue.GetValueOrDefault().Date )
-      {
-        invalidate = true;
-      }
-
-      if( invalidate )
-      {
-        //Invalidate the entire listbox content
-        this.InvalidateListBoxItems();
-      }
-      else
-      {
-        //Just update the selected item
-        this.UpdateListBoxSelectedItem();
-      }
-    }
-
-    protected override void Popup_Opened( object sender, EventArgs e )
-    {
-      base.Popup_Opened( sender, e );
-
-      if( _timeListBox != null )
-      {
-        this.UpdateListBoxItems();
-
-        var time = (this.Value != null) ? this.Value.Value.TimeOfDay : TimePicker.StartTimeDefaultValue;
-        var nearestItem = this.GetNearestTimeItem( time );
-        if( nearestItem != null )
-        {
-          _timeListBox.ScrollIntoView( nearestItem );
-          this.UpdateListBoxSelectedItem();
-        }
-        _timeListBox.Focus();
-      }
-    }
-
-    public override void OnApplyTemplate()
-    {
-      if( this.TextBox != null )
-      {
-        this.TextBox.GotKeyboardFocus -= this.TextBoxSpinner_GotKeyboardFocus;
-      }
-      if( this.Spinner != null )
-      {
-        this.Spinner.GotKeyboardFocus -= this.TextBoxSpinner_GotKeyboardFocus;
-      }
-
-      base.OnApplyTemplate();
-
-      if( this.TextBox != null )
-      {
-        this.TextBox.GotKeyboardFocus += this.TextBoxSpinner_GotKeyboardFocus;
-      }
-      if( this.Spinner != null )
-      {
-        this.Spinner.GotKeyboardFocus += this.TextBoxSpinner_GotKeyboardFocus;
-      }
-
-      if( _timeListBox != null )
-      {
-        _timeListBox.SelectionChanged -= this.TimeListBox_SelectionChanged;
-        _timeListBox.MouseUp -= this.TimeListBox_MouseUp;
-      }
-
-      _timeListBox = this.GetTemplateChild( PART_TimeListItems ) as ListBox;
-
-      if( _timeListBox != null )
-      {
-        _timeListBox.SelectionChanged += this.TimeListBox_SelectionChanged;
-        _timeListBox.MouseUp += this.TimeListBox_MouseUp;
-
-        this.InvalidateListBoxItems();
-      }
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void TimeListBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count > 0 )
-      {
-        TimeItem selectedTimeListItem = ( TimeItem )e.AddedItems[ 0 ];
-        var time = selectedTimeListItem.Time;
-
-        if( this.UpdateValueOnEnterKey )
-        {
-          var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-          var date = currentValue ?? this.ContextNow;
-          var newValue = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind );
-          this.TextBox.Text = newValue.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-        }
-        else
-        {
-          var date = this.Value ?? this.ContextNow;
-          this.Value = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind );
-        }
-      }
-    }
-
-    private void TextBoxSpinner_GotKeyboardFocus( object sender, KeyboardFocusChangedEventArgs e )
-    {
-      this.ClosePopup( true );
-    }
-
-    private void TimeListBox_MouseUp( object sender, MouseButtonEventArgs e )
-    {
-      this.ClosePopup( true );
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void ValidateTime( TimeSpan time )
-    {
-      if( time.TotalHours >= 24d )
-        throw new ArgumentException( "Time value cannot be greater than or equal to 24 hours." );
-    }
-
-    public IEnumerable GenerateTimeListItemsSource()
-    {
-      TimeSpan time = StartTime;
-      TimeSpan endTime = EndTime;
-
-      if( endTime <= time )
-      {
-        endTime = EndTimeDefaultValue;
-        time = StartTimeDefaultValue;
-      }
-
-      // Limit the content of the list to the Minimum or Maximum
-      // if the date is set to the Minimum or Maximum.
-      if( this.Value.HasValue )
-      {
-        DateTime date = this.Value.Value;
-        DateTime minDate = this.Minimum.GetValueOrDefault( DateTime.MinValue );
-        DateTime maxDate = this.Maximum.GetValueOrDefault( DateTime.MaxValue );
-        TimeSpan minTime = minDate.TimeOfDay;
-        TimeSpan maxTime = maxDate.TimeOfDay;
-
-        if( date.Date == minDate.Date && time.Ticks < minTime.Ticks )
-        {
-          time = minTime;
-        }
-
-        if( date.Date == maxDate.Date && endTime.Ticks > maxTime.Ticks )
-        {
-          endTime = maxTime;
-        }
-
-        if( endTime < time )
-        {
-          time = endTime;
-        }
-      }
-
-
-      TimeSpan timeInterval = TimeInterval;
-      List<TimeItem> timeItemList = new List<TimeItem>();
-
-      if( time != null && endTime != null && timeInterval != null && timeInterval.Ticks > 0 )
-      {
-        while( time <= endTime )
-        {
-          timeItemList.Add( this.CreateTimeItem( time ) );
-          time = time.Add( timeInterval );
-        }
-      }
-      return timeItemList;
-    }
-
-    protected virtual TimeItem CreateTimeItem( TimeSpan time )
-    {
-      var date = Value ?? this.ContextNow;
-      string formatString = this.GetFormatString( (DateTimeFormat)this.Format );
-      return new TimeItem( date.Date.Add( time ).ToString( formatString, CultureInfo ), time );
-    }
-
-    private void UpdateListBoxSelectedItem()
-    {
-      if( _timeListBox != null )
-      {
-        TimeItem time = null;
-        if( Value != null )
-        {
-          time = this.CreateTimeItem( Value.Value.TimeOfDay );
-          if( !_timeListBox.Items.Contains( time ) )
-          {
-            time = null;
-          }
-        }
-
-        _timeListBox.SelectedItem = time;
-      }
-    }
-
-    private void InvalidateListBoxItems()
-    {
-      _isListBoxInvalid = true;
-      if( IsOpen )
-      {
-        UpdateListBoxItems();
-      }
-    }
-
-    private void UpdateListBoxItems()
-    {
-      if( _timeListBox != null )
-      {
-        if( _isListBoxInvalid )
-        {
-          _timeListBox.ItemsSource = GenerateTimeListItemsSource();
-          UpdateListBoxSelectedItem();
-          _isListBoxInvalid = false;
-        }
-      }
-    }
-
-    private TimeItem GetNearestTimeItem( TimeSpan time )
-    {
-      if( _timeListBox != null )
-      {
-        int itemCount = _timeListBox.Items.Count;
-        for( int i = 0; i < itemCount; i++ )
-        {
-          TimeItem timeItem = _timeListBox.Items[ i ] as TimeItem;
-          if( timeItem != null )
-          {
-            if( timeItem.Time >= time )
-              return timeItem;
-          }
-        }
-
-        //They are all less than the searched time. 
-        //Return the last one. (Should also be the greater one.)
-        if( itemCount > 0 )
-        {
-          return _timeListBox.Items[ itemCount - 1 ] as TimeItem;
-        }
-      }
-
-      return null;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index cd7141c6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,305 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                    Focusable="False"
-                    Margin="0,0,3,0" />
-  </DataTemplate>
-
-  <Style x:Key="TimePickerToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                 CornerRadius="0"
-                                 RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
-                                 RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
-                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                 RenderPressed="{TemplateBinding IsPressed}">
-
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter HorizontalAlignment="Stretch"
-                                  VerticalAlignment="Stretch"
-                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-            </chrome:ButtonChrome>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="TimeItemStyle"
-         TargetType="ListBoxItem">
-    <Style.Setters>
-    <Setter Property="Padding"
-              Value="4" />
-    </Style.Setters>
-    <Style.Triggers>
-      <!-- MouseOver Only -->
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver"
-                     Value="True" />
-          <Condition Property="IsSelected"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background"
-                Value="#FFB8E0F3" />
-        <Setter Property="BorderBrush"
-                Value="#FF26A0DA" />
-      </MultiTrigger>
-
-      <!-- Selected Only -->
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-          <Condition Property="IsSelected"
-                     Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background"
-                Value="#FFC4E5F6" />
-        <Setter Property="BorderBrush"
-                Value="#FF26A0DA" />
-      </MultiTrigger>
-
-      <!-- MouseOver + Selected -->
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver"
-                     Value="True" />
-          <Condition Property="IsSelected"
-                     Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background"
-                Value="#FFD1E8FF" />
-        <Setter Property="BorderBrush"
-                Value="#FF66A7E8" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-  <!-- =============================================================================== -->
-  <!-- TimePicker                                                                      -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:TimePicker}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:TimePicker}">
-          <Grid x:Name="root">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <local:ButtonSpinner x:Name="PART_Spinner"
-                                 IsTabStop="False"
-                                 Background="{TemplateBinding Background}"
-                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                 HorizontalContentAlignment="Stretch"
-                                 VerticalContentAlignment="Stretch"
-                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                 ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                 AllowSpin="{TemplateBinding AllowSpin}"
-                                 ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-              <local:WatermarkTextBox x:Name="PART_TextBox"
-                                      BorderThickness="0"
-                                      Background="Transparent"
-                                      FontFamily="{TemplateBinding FontFamily}"
-                                      FontSize="{TemplateBinding FontSize}"
-                                      FontStretch="{TemplateBinding FontStretch}"
-                                      FontStyle="{TemplateBinding FontStyle}"
-                                      FontWeight="{TemplateBinding FontWeight}"
-                                      Foreground="{TemplateBinding Foreground}"
-                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                      IsTabStop="True"
-                                      MinWidth="20"
-                                      AcceptsReturn="False"
-                                      Padding="{TemplateBinding Padding}"
-                                      TextAlignment="{TemplateBinding TextAlignment}"
-                                      TextWrapping="NoWrap"
-                                      Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                      TabIndex="{TemplateBinding TabIndex}"
-                                      Watermark="{TemplateBinding Watermark}"
-                                      WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-            </local:ButtonSpinner>
-            <ToggleButton x:Name="_timePickerToggleButton"
-                          Grid.Column="1"
-                          Background="White"
-                          Focusable="False"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource TimePickerToggleButtonStyle}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}">
-            </ToggleButton>
-            <Popup x:Name="PART_Popup"
-                   IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      MinWidth="{Binding ActualWidth, ElementName=root}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                      Background="{StaticResource PanelBackgroundBrush}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}">
-                <Grid>
-                  <ListBox x:Name="PART_TimeListItems"
-                           BorderThickness="0"
-                           DisplayMemberPath="Display"
-                           ItemContainerStyle="{StaticResource TimeItemStyle}" >
-                  </ListBox>
-                </Grid>
-              </Border>
-            </Popup>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <Trigger Property="IsKeyboardFocusWithin"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsFocused"
-                     Value="True">
-              <Setter TargetName="PART_TextBox"
-                      Property="FocusManager.FocusedElement"
-                      Value="{Binding ElementName=PART_TextBox}" />
-            </Trigger>
-            <!--ToggleButton can be closed when TimePicker is included in DateTimePicker-->
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                           Value="True" />
-                <Condition Binding="{Binding TemplatedParent, RelativeSource={RelativeSource Self}, Converter={StaticResource ObjectTypeToNameConverter}}"
-                           Value="DateTimePicker" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsHitTestVisible"
-                      Value="True"
-                      TargetName="_timePickerToggleButton" />
-            </MultiDataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
deleted file mode 100644
index 63daafc1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
+++ /dev/null
@@ -1,283 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <!-- =============================================================================== -->
-  <!-- ResourceDictionary for TimePicker and related controls                          -->
-  <!-- =============================================================================== -->
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="Gray"
-                    Focusable="False"
-                    Margin="0,0,3,0" />
-  </DataTemplate>
-
-  <LinearGradientBrush x:Key="PopupDarkBorderBrush"
-                       EndPoint="0.5,1"
-                       StartPoint="0.5,0">
-    <GradientStop Color="#FFA3AEB9"
-                  Offset="0" />
-    <GradientStop Color="#FF8399A9"
-                  Offset="0.375" />
-    <GradientStop Color="#FF718597"
-                  Offset="0.375" />
-    <GradientStop Color="#FF617584"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <Style x:Key="TimePickerToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                 CornerRadius="0,2.75,2.75,0"
-                                 RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
-                                 RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
-                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                 RenderPressed="{TemplateBinding IsPressed}">
-
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter HorizontalAlignment="Stretch"
-                                  VerticalAlignment="Stretch"
-                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-            </chrome:ButtonChrome>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <SolidColorBrush x:Key="ListItemHover"
-                   Color="#FFE7F5FD" />
-
-  <Style x:Key="TimeItemStyle"
-         TargetType="ListBoxItem">
-    <Style.Setters>
-      <Setter Property="Padding"
-              Value="4" />
-    </Style.Setters>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver"
-               Value="True">
-        <Setter Property="Background"
-                Value="{StaticResource ListItemHover}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- =============================================================================== -->
-  <!-- TimePicker                                                                      -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:TimePicker}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:TimePicker}">
-          <Grid x:Name="root">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <local:ButtonSpinner x:Name="PART_Spinner"
-                                 IsTabStop="False"
-                                 Background="{TemplateBinding Background}"
-                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                 HorizontalContentAlignment="Stretch"
-                                 VerticalContentAlignment="Stretch"
-                                 ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                 AllowSpin="{TemplateBinding AllowSpin}"
-                                 ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-              <local:WatermarkTextBox x:Name="PART_TextBox"
-                                      BorderThickness="0"
-                                      Background="Transparent"
-                                      FontFamily="{TemplateBinding FontFamily}"
-                                      FontSize="{TemplateBinding FontSize}"
-                                      FontStretch="{TemplateBinding FontStretch}"
-                                      FontStyle="{TemplateBinding FontStyle}"
-                                      FontWeight="{TemplateBinding FontWeight}"
-                                      Foreground="{TemplateBinding Foreground}"
-                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                      IsTabStop="True"
-                                      MinWidth="20"
-                                      AcceptsReturn="False"
-                                      Padding="{TemplateBinding Padding}"
-                                      TextAlignment="{TemplateBinding TextAlignment}"
-                                      TextWrapping="NoWrap"
-                                      Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                      TabIndex="{TemplateBinding TabIndex}"
-                                      Watermark="{TemplateBinding Watermark}"
-                                      WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-            </local:ButtonSpinner>
-            <ToggleButton x:Name="_timePickerToggleButton"
-                          Grid.Column="1"
-                          Background="White"
-                          Focusable="False"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource TimePickerToggleButtonStyle}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}" >
-            </ToggleButton>
-            <Popup x:Name="PART_Popup"
-                   IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      MinWidth="{Binding ActualWidth, ElementName=root}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                      Background="{StaticResource PopupBackgroundBrush}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}">
-                <Grid>
-                  <ListBox x:Name="PART_TimeListItems"
-                           BorderThickness="0"
-                           DisplayMemberPath="Display"
-                           ItemContainerStyle="{StaticResource TimeItemStyle}" >
-                  </ListBox>
-                </Grid>
-              </Border>
-            </Popup>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <!--ToggleButton can be closed when TimePicker is included in DateTimePicker-->
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                           Value="True" />
-                <Condition Binding="{Binding TemplatedParent, RelativeSource={RelativeSource Self}, Converter={StaticResource ObjectTypeToNameConverter}}"
-                           Value="DateTimePicker" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsHitTestVisible"
-                      Value="True"
-                      TargetName="_timePickerToggleButton" />
-            </MultiDataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
deleted file mode 100644
index 49629d6f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
+++ /dev/null
@@ -1,595 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Windows;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class TimeSpanUpDown : DateTimeUpDownBase<TimeSpan?>
-  {
-    #region Constructors
-
-    static TimeSpanUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimeSpanUpDown ), new FrameworkPropertyMetadata( typeof( TimeSpanUpDown ) ) );
-      MaximumProperty.OverrideMetadata( typeof( TimeSpanUpDown ), new FrameworkPropertyMetadata( TimeSpan.MaxValue ) );
-      MinimumProperty.OverrideMetadata( typeof( TimeSpanUpDown ), new FrameworkPropertyMetadata( TimeSpan.MinValue ) );
-      DefaultValueProperty.OverrideMetadata( typeof( TimeSpanUpDown ), new FrameworkPropertyMetadata( TimeSpan.Zero ) );
-    }
-
-    public TimeSpanUpDown()
-    {
-      DataObject.AddPastingHandler( this, this.OnPasting );
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region FractionalSecondsDigitsCount
-
-    public static readonly DependencyProperty FractionalSecondsDigitsCountProperty = DependencyProperty.Register( "FractionalSecondsDigitsCount", typeof( int ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( 0, OnFractionalSecondsDigitsCountChanged, OnCoerceFractionalSecondsDigitsCount ) );
-    public int FractionalSecondsDigitsCount
-    {
-      get
-      {
-        return ( int )GetValue( FractionalSecondsDigitsCountProperty );
-      }
-      set
-      {
-        SetValue( FractionalSecondsDigitsCountProperty, value );
-      }
-    }
-
-    private static object OnCoerceFractionalSecondsDigitsCount( DependencyObject o, object value )
-    {
-      TimeSpanUpDown timeSpanUpDown = o as TimeSpanUpDown;
-      if( timeSpanUpDown != null )
-      {
-        int digitsCount = (int)value;
-        if( digitsCount < 0 || digitsCount > 3 )
-          throw new ArgumentException( "Fractional seconds digits count must be between 0 and 3." );
-      }
-      return value;
-    }
-
-    private static void OnFractionalSecondsDigitsCountChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimeSpanUpDown timeSpanUpDown = o as TimeSpanUpDown;
-      if( timeSpanUpDown != null )
-        timeSpanUpDown.OnFractionalSecondsDigitsCountChanged( ( int )e.OldValue, ( int )e.NewValue );
-    }
-
-    protected virtual void OnFractionalSecondsDigitsCountChanged( int oldValue, int newValue )
-    {
-      var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-      this.SyncTextAndValueProperties( false, this.Text );
-    }
-
-    #endregion //FractionalSecondsDigitsCount
-
-    #region ShowSeconds
-
-    public static readonly DependencyProperty ShowSecondsProperty = DependencyProperty.Register( "ShowSeconds", typeof( bool ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( true, OnShowSecondsChanged ) );
-    public bool ShowSeconds
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSecondsProperty );
-      }
-      set
-      {
-        SetValue( ShowSecondsProperty, value );
-      }
-    }
-
-    private static void OnShowSecondsChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimeSpanUpDown timeSpanUpDown = o as TimeSpanUpDown;
-      if( timeSpanUpDown != null )
-        timeSpanUpDown.OnShowSecondsChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnShowSecondsChanged( bool oldValue, bool newValue )
-    {
-      var value = this.UpdateValueOnEnterKey
-                  ? ( this.TextBox != null ) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-      this.SyncTextAndValueProperties( false, this.Text );
-    }
-
-    #endregion //ShowSeconds
-
-    #endregion
-
-    #region BaseClass Overrides
-
-    protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
-    {
-      var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-    }
-
-    protected override void SetValidSpinDirection()
-    {
-      ValidSpinDirections validDirections = ValidSpinDirections.None;
-
-      if( !this.IsReadOnly )
-      {
-        if( this.IsLowerThan( this.Value, this.Maximum ) || !this.Value.HasValue || !this.Maximum.HasValue)
-          validDirections = validDirections | ValidSpinDirections.Increase;
-
-        if( this.IsGreaterThan( this.Value, this.Minimum ) || !this.Value.HasValue || !this.Minimum.HasValue )
-          validDirections = validDirections | ValidSpinDirections.Decrease;
-      }
-
-      if( this.Spinner != null )
-        this.Spinner.ValidSpinDirection = validDirections;
-    }
-
-    protected override void OnIncrement()
-    {
-      this.Increment( this.Step );
-    }
-
-    protected override void OnDecrement()
-    {
-      this.Increment( -this.Step );
-    }
-
-    protected override string ConvertValueToText()
-    {
-      if( this.Value == null )
-        return string.Empty;
-
-      return this.ParseValueIntoTimeSpanInfo( this.Value );
-    }
-
-    protected override TimeSpan? ConvertTextToValue( string text )
-    {
-      if( string.IsNullOrEmpty( text ) )
-        return null;
-
-      TimeSpan timeSpan = TimeSpan.Parse( text );
-
-      if( this.ClipValueToMinMax )
-      {
-        return this.GetClippedMinMaxValue( timeSpan );
-      }
-
-      this.ValidateDefaultMinMax( timeSpan );
-
-      return timeSpan;
-    }
-
-    protected override void OnPreviewTextInput( TextCompositionEventArgs e )
-    {
-      e.Handled = !this.IsNumber( e.Text );
-      base.OnPreviewTextInput( e );
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( e.Key == Key.Space )
-      {
-        e.Handled = true;
-      }
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnTextChanged( string previousValue, string currentValue )
-    {
-      if( !_processTextChanged )
-        return;
-
-      if( String.IsNullOrEmpty( currentValue ) )
-      {
-        if( !this.UpdateValueOnEnterKey )
-        {
-          this.Value = null;
-        }
-        return;
-      }
-
-      TimeSpan current = this.Value.HasValue ? this.Value.Value : new TimeSpan();
-      TimeSpan result;
-      var success = TimeSpan.TryParse( currentValue, out result );
-      if( !success )
-      {
-        // Validate when more than 60 seconds (or more than 60 minutes, or more than 24 hours) are entered.
-        var separators = currentValue.Where( x => x == ':' || x == '.' ).ToList();
-        var values = currentValue.Split( new char[] { ':', '.' } );
-        if( ( values.Count() >= 2 ) && !values.Any( x => string.IsNullOrEmpty( x ) ) )
-        {
-          bool haveDays = separators.First() == '.';
-          bool haveMS = ( separators.Count() > 1 ) && ( separators.Last() == '.' );
-
-          result = new TimeSpan( haveDays ? int.Parse( values[ 0 ] ) : 0,  //Days
-                                 haveDays ? int.Parse( values[ 1 ] ) : int.Parse( values[ 0 ] ),  //Hours
-                                 haveDays ? int.Parse( values[ 2 ] ) : int.Parse( values[ 1 ] ),  //Minutes
-                                 ( haveDays && this.ShowSeconds ) ? int.Parse( values[ 3 ] ) : this.ShowSeconds ? int.Parse( values[ 2 ] ) : 0,  //Seconds
-                                 haveMS ? int.Parse( values.Last() ) : 0 );  //Milliseconds
-        }
-      }
-
-      currentValue = result.ToString();
-
-      // When text is typed, if UpdateValueOnEnterKey is true, 
-      // Sync Value on Text only when Enter Key is pressed.
-      if( ( _isTextChangedFromUI && !this.UpdateValueOnEnterKey )
-        || !_isTextChangedFromUI )
-      {
-        this.SyncTextAndValueProperties( true, currentValue );
-      }
-    }
-
-    protected override void OnValueChanged( TimeSpan? oldValue, TimeSpan? newValue )
-    {
-      //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
-      //but only if it is not null
-      if( newValue != null )
-      {
-        var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-        this.InitializeDateTimeInfoList( value );
-      }
-      base.OnValueChanged( oldValue, newValue );
-    }
-
-    protected override void PerformMouseSelection()
-    {
-      var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-      base.PerformMouseSelection();
-    }
-
-    protected override void InitializeDateTimeInfoList( TimeSpan? value )
-    {
-      var lastDayInfo = _dateTimeInfoList.FirstOrDefault( x => x.Type == DateTimePart.Day );
-      bool hasDay = lastDayInfo != null;
-      var negInfo = _dateTimeInfoList.FirstOrDefault( x => x.Type == DateTimePart.Other );
-      bool hasNegative = (negInfo != null) && (negInfo.Content == "-");
-
-      _dateTimeInfoList.Clear();
-
-      if( value.HasValue && value.Value.TotalMilliseconds < 0 )
-      {
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = "-", IsReadOnly = true } );
-        // Negative has been added, move TextBox.Selection to keep it on current DateTimeInfo
-        if( !hasNegative && (this.TextBox != null) )
-        {
-          _fireSelectionChangedEvent = false;
-          this.TextBox.SelectionStart++;
-          _fireSelectionChangedEvent = true;
-        }
-      }
-
-      if( value.HasValue && value.Value.Days != 0 )
-      {
-        int dayLength = Math.Abs( value.Value.Days ).ToString().Length;
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Day, Length = dayLength, Format = "dd" } );
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ".", IsReadOnly = true } );
-
-        if( this.TextBox != null )
-        {
-          //number of digits for days has changed when selection is not on date part, move TextBox.Selection to keep it on current DateTimeInfo
-          if( hasDay && (dayLength != lastDayInfo.Length) && (_selectedDateTimeInfo.Type != DateTimePart.Day) )
-          {
-            _fireSelectionChangedEvent = false;
-            this.TextBox.SelectionStart = Math.Max( 0, this.TextBox.SelectionStart + (dayLength - lastDayInfo.Length) );
-            _fireSelectionChangedEvent = true;
-          }
-          // Day has been added, move TextBox.Selection to keep it on current DateTimeInfo
-          else if( !hasDay )
-          {
-            _fireSelectionChangedEvent = false;
-            this.TextBox.SelectionStart += (dayLength + 1);
-            _fireSelectionChangedEvent = true;
-          }
-        }
-      }
-      // Day has been removed, move TextBox.Selection to keep it on current DateTimeInfo
-      else if( hasDay )
-      {
-        _fireSelectionChangedEvent = false;
-        this.TextBox.SelectionStart = Math.Max( hasNegative ? 1 : 0, this.TextBox.SelectionStart - (lastDayInfo.Length + 1) );
-        _fireSelectionChangedEvent = true;
-      }
-
-      _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Hour24, Length = 2, Format = "hh" } );
-      _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ":", IsReadOnly = true } );
-      _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Minute, Length = 2, Format = "mm" } );
-      if( this.ShowSeconds )
-      {
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ":", IsReadOnly = true } );
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Second, Length = 2, Format = "ss" } );
-      }
-
-      if( this.FractionalSecondsDigitsCount > 0 )
-      {
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ".", IsReadOnly = true } );
-        string fraction = new string( 'f', this.FractionalSecondsDigitsCount );
-        //If the "f" custom format specifier is used alone, specify "%f" so that it is not misinterpreted as a standard format string.
-        if( fraction.Length == 1 )
-        {
-          fraction = "%" + fraction;
-        }
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Millisecond, Length = this.FractionalSecondsDigitsCount, Format = fraction } );
-      }
-
-      if( value.HasValue )
-      {
-        this.ParseValueIntoTimeSpanInfo( value );
-      }
-    }
-
-    protected override bool IsLowerThan( TimeSpan? value1, TimeSpan? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return (value1.Value < value2.Value);
-    }
-
-    protected override bool IsGreaterThan( TimeSpan? value1, TimeSpan? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return (value1.Value > value2.Value);
-    }
-
-
-    #endregion
-
-    #region Methods
-
-    private string ParseValueIntoTimeSpanInfo( TimeSpan? value )
-    {
-      string text = string.Empty;
-
-      _dateTimeInfoList.ForEach( info =>
-      {
-        if( info.Format == null )
-        {
-          info.StartPosition = text.Length;
-          info.Length = info.Content.Length;
-          text += info.Content;
-        }
-        else
-        {
-          TimeSpan span = TimeSpan.Parse( value.ToString() );
-          info.StartPosition = text.Length;
-#if VS2008
-          switch (info.Format)
-          {
-              case "hh":
-                  info.Content = span.Hours.ToString("00");
-                  break;
-              case "mm":
-                  info.Content = span.Minutes.ToString("00");
-                  break;
-              case "ss":
-                  info.Content = span.Seconds.ToString("00");
-                  break;
-              case "dd":
-                  info.Content = span.Days.ToString();
-                  break;
-              case "%f":
-                  info.Content = (span.Milliseconds / 100).ToString();
-                  break;
-              case "ff":
-                  info.Content = (span.Milliseconds / 10).ToString();
-                  break;
-              case "fff":
-                  info.Content = span.Milliseconds.ToString();
-                  break;
-              default:
-                  throw new InvalidOperationException("Wrong TimeSpan format");
-          }
-#else
-          info.Content = span.ToString( info.Format, this.CultureInfo.DateTimeFormat );
-#endif
-          if( info.Format == "dd" )
-          {
-            info.Content = Convert.ToInt32( info.Content ).ToString();
-          }
-          info.Length = info.Content.Length;
-          text += info.Content;
-        }
-      } );
-
-      return text;
-    }
-
-    private TimeSpan? UpdateTimeSpan( TimeSpan? currentValue, int value )
-    {
-      DateTimeInfo info = _selectedDateTimeInfo;
-
-      //this only occurs when the user manually type in a value for the Value Property
-      if( info == null )
-      {
-        info = (this.CurrentDateTimePart != DateTimePart.Other)
-               ? this.GetDateTimeInfo( this.CurrentDateTimePart )
-               : (_dateTimeInfoList[ 0 ].Content != "-") ? _dateTimeInfoList[ 0 ] : _dateTimeInfoList[ 1 ]; //Skip negative sign
-      }
-
-      TimeSpan? result = null;
-
-      try
-      {
-        switch( info.Type )
-        {
-          case DateTimePart.Day:
-            result = ( ( TimeSpan )currentValue).Add( new TimeSpan( value, 0, 0, 0, 0 ) );
-            break;
-          case DateTimePart.Hour24:
-            result = ( ( TimeSpan )currentValue).Add( new TimeSpan( 0, value, 0, 0, 0 ) );
-            break;
-          case DateTimePart.Minute:
-            result = ( ( TimeSpan )currentValue).Add( new TimeSpan( 0, 0, value, 0, 0 ) );
-            break;
-          case DateTimePart.Second:
-            result = ( ( TimeSpan )currentValue).Add( new TimeSpan( 0, 0, 0, value, 0 ) );
-            break;
-          case DateTimePart.Millisecond:
-            switch( this.FractionalSecondsDigitsCount )
-            {
-              case 1:
-                value = value * 100;
-                break;
-              case 2:
-                value = value * 10;
-                break;
-              default:
-                value = value * 1;
-                break;
-            }
-            result = ( ( TimeSpan )currentValue).Add( new TimeSpan( 0, 0, 0, 0, value ) );
-            break;
-          default:
-            break;
-        }
-      }
-      catch
-      {
-        //this can occur if the date/time = 1/1/0001 12:00:00 AM which is the smallest date allowed.
-        //I could write code that would validate the date each and everytime but I think that it would be more
-        //efficient if I just handle the edge case and allow an exeption to occur and swallow it instead.
-      }
-
-      result = ( ( result != null ) && result.HasValue )
-                ? result.Value
-                : result;
-
-      result = this.CoerceValueMinMax( result );
-
-      return result;
-    }
-
-    private void Increment( int step )
-    {
-      // if UpdateValueOnEnterKey is true, 
-      // Sync Value on Text only when Enter Key is pressed.
-      if( this.UpdateValueOnEnterKey )
-      {
-        var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-        var newValue = currentValue.HasValue
-                       ? this.UpdateTimeSpan( currentValue, step )
-                       : this.DefaultValue ?? TimeSpan.Zero;
-
-        if( newValue != null )
-        {
-          this.InitializeDateTimeInfoList( newValue );
-          var selectionStart = this.TextBox.SelectionStart;
-          var selectionLength = this.TextBox.SelectionLength;
-#if VS2008
-          this.TextBox.Text = newValue.Value.ToString();
-#else
-          this.TextBox.Text = newValue.Value.ToString( this.GetTimeSpanFormat() );
-#endif
-          this.TextBox.Select( selectionStart, selectionLength );
-        }
-      }
-      else
-      {
-        if( this.Value.HasValue )
-        {
-          var newValue = this.UpdateTimeSpan( this.Value, step );
-          if( newValue != null )
-          {
-            this.InitializeDateTimeInfoList( newValue );
-            var selectionStart = this.TextBox.SelectionStart;
-            var selectionLength = this.TextBox.SelectionLength;
-            this.Value = newValue;
-            this.TextBox.Select( selectionStart, selectionLength );
-          }
-        }
-        else
-        {
-          this.Value = this.DefaultValue ?? TimeSpan.Zero;
-        }
-      }
-    }
-
-#if !VS2008
-    private string GetTimeSpanFormat()
-    {
-      //use this format : "d.hh\:mm\:ss\.fff"
-      var formatParts = _dateTimeInfoList.Select( part =>
-      {
-        if( part.Format == null )
-          return '\\' + part.Content;
-
-        if( part.Format.Contains( 'd' ) )
-        {
-          var dayInfo = _dateTimeInfoList.FirstOrDefault( info => info.Type == DateTimePart.Day );
-          part.Format = string.Join( "", Enumerable.Repeat( "d", dayInfo.Length ) );
-        }
-        return part.Format;
-      } ).ToList();
-
-      return string.Join( "", formatParts );
-    }
-#endif
-
-    private bool IsNumber( string str )
-    {
-      foreach( char c in str )
-      {
-        if( !char.IsNumber( c ) )
-          return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region Event Handlers
-
-    private void OnPasting( object sender, DataObjectPastingEventArgs e )
-    {
-      if( e.DataObject.GetDataPresent( typeof( string ) ) )
-      {
-        // Allow pasting only TimeSpan values
-        var pasteText = e.DataObject.GetData( typeof( string ) ) as string;
-        TimeSpan result;
-        var success = TimeSpan.TryParse( pasteText, out result );
-        if( !success )
-        {
-          e.CancelCommand();
-        }
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 5581bb6e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,139 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}"
-                        Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                        Focusable="False"
-                        Margin="0,0,3,0" />
-    </DataTemplate>
-
-
-    <!-- =============================================================================== -->
-    <!-- TimeSpanUpDown                                                                  -->
-    <!-- =============================================================================== -->
-
-    <Style x:Key="TimeSpanUpDown"
-           TargetType="{x:Type local:TimeSpanUpDown}">
-        <Setter Property="Background"
-                Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-        <Setter Property="BorderThickness"
-                Value="1" />
-        <Setter Property="Foreground"
-                Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-        <Setter Property="HorizontalContentAlignment"
-                Value="Right" />
-        <Setter Property="VerticalContentAlignment"
-                Value="Center" />
-        <Setter Property="TextAlignment"
-                Value="Right" />
-      <Setter Property="IsTabStop"
-              Value="False" />
-      <Setter Property="WatermarkTemplate"
-                Value="{StaticResource DefaultWatermarkTemplate}" />
-      <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:TimeSpanUpDown}">
-                    <local:ButtonSpinner x:Name="PART_Spinner"
-                                         IsTabStop="False"
-                                         Background="{TemplateBinding Background}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         BorderThickness="{TemplateBinding BorderThickness}"
-                                         HorizontalContentAlignment="Stretch"
-                                         VerticalContentAlignment="Stretch"
-                                         ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                         AllowSpin="{TemplateBinding AllowSpin}"
-                                         ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                        <local:WatermarkTextBox x:Name="PART_TextBox"
-                                                BorderThickness="0"
-                                                Background="Transparent"
-                                                ContextMenu="{TemplateBinding ContextMenu}"
-                                                FontFamily="{TemplateBinding FontFamily}"
-                                                FontSize="{TemplateBinding FontSize}"
-                                                FontStretch="{TemplateBinding FontStretch}"
-                                                FontStyle="{TemplateBinding FontStyle}"
-                                                FontWeight="{TemplateBinding FontWeight}"
-                                                Foreground="{TemplateBinding Foreground}"
-                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                                IsTabStop="True"
-                                                MinWidth="20"
-                                                AcceptsReturn="False"
-                                                Padding="{TemplateBinding Padding}"
-                                                TextAlignment="{TemplateBinding TextAlignment}"
-                                                TextWrapping="NoWrap"
-                                                TabIndex="{TemplateBinding TabIndex}"
-                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Watermark="{TemplateBinding Watermark}"
-                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-                    </local:ButtonSpinner>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver"
-                                 Value="True">
-                            <Setter Property="BorderBrush"
-                                    Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-                        </Trigger>
-                     <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                           <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                      Value="False" />
-                           <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                                      Value="False" />
-                        </MultiDataTrigger.Conditions>
-                        <Setter Property="IsReadOnly"
-                                Value="True"
-                                TargetName="PART_TextBox" />
-                     </MultiDataTrigger>
-                     <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                  Value="True">
-                        <Setter Property="IsReadOnly"
-                                Value="True"
-                                TargetName="PART_TextBox" />
-                     </DataTrigger>
-                     <Trigger Property="IsKeyboardFocusWithin"
-                                 Value="True">
-                            <Setter Property="BorderBrush"
-                                    Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled"
-                                 Value="False">
-                            <Setter Property="Foreground"
-                                    Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                        </Trigger>
-                        <Trigger Property="IsFocused"
-                                 Value="True">
-                            <Setter TargetName="PART_TextBox"
-                                    Property="FocusManager.FocusedElement"
-                                    Value="{Binding ElementName=PART_TextBox}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:TimeSpanUpDown}"
-           BasedOn="{StaticResource TimeSpanUpDown}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
deleted file mode 100644
index fe271781..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-   <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}"
-                      Foreground="Gray"
-                      Focusable="False"
-                      Margin="0,0,3,0" />
-   </DataTemplate>
-
-   <!-- =============================================================================== -->
-   <!-- TimeSpanUpDown                                                                  -->
-   <!-- =============================================================================== -->
-
-   <Style x:Key="TimeSpanUpDown"
-          TargetType="{x:Type local:TimeSpanUpDown}">
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-      <Setter Property="BorderBrush"
-              Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-      <Setter Property="BorderThickness"
-              Value="1" />
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-      <Setter Property="HorizontalContentAlignment"
-              Value="Right" />
-      <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-      <Setter Property="TextAlignment"
-              Value="Right" />
-      <Setter Property="WatermarkTemplate"
-              Value="{StaticResource DefaultWatermarkTemplate}" />
-      <Setter Property="IsTabStop"
-              Value="False" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:TimeSpanUpDown}">
-               <local:ButtonSpinner x:Name="PART_Spinner"
-                                    IsTabStop="False"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                    AllowSpin="{TemplateBinding AllowSpin}"
-                                    ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                  <local:WatermarkTextBox x:Name="PART_TextBox"
-                                          BorderThickness="0"
-                                          Background="Transparent"
-                                          ContextMenu="{TemplateBinding ContextMenu}"
-                                          FontFamily="{TemplateBinding FontFamily}"
-                                          FontSize="{TemplateBinding FontSize}"
-                                          FontStretch="{TemplateBinding FontStretch}"
-                                          FontStyle="{TemplateBinding FontStyle}"
-                                          FontWeight="{TemplateBinding FontWeight}"
-                                          Foreground="{TemplateBinding Foreground}"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                          IsTabStop="True"
-                                          MinWidth="20"
-                                          AcceptsReturn="False"
-                                          Padding="{TemplateBinding Padding}"
-                                          TextAlignment="{TemplateBinding TextAlignment}"
-                                          TextWrapping="NoWrap"
-                                          TabIndex="{TemplateBinding TabIndex}"
-                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                          Watermark="{TemplateBinding Watermark}"
-                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-               </local:ButtonSpinner>
-               <ControlTemplate.Triggers>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                   Value="False" />
-                        <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                                   Value="False" />
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="IsReadOnly"
-                             Value="True"
-                             TargetName="PART_TextBox" />
-                  </MultiDataTrigger>
-                  <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                               Value="True">
-                     <Setter Property="IsReadOnly"
-                             Value="True"
-                             TargetName="PART_TextBox" />
-                  </DataTrigger>
-                  <Trigger Property="IsFocused"
-                           Value="True">
-                     <Setter TargetName="PART_TextBox"
-                             Property="FocusManager.FocusedElement"
-                             Value="{Binding ElementName=PART_TextBox}" />
-                  </Trigger>
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-                     <Setter Property="Foreground"
-                             Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style TargetType="{x:Type local:TimeSpanUpDown}"
-          BasedOn="{StaticResource TimeSpanUpDown}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
deleted file mode 100644
index 74307d71..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public sealed class DateElement : IComparable<DateElement>
-  {
-    #region Members
-
-    internal Rect PlacementRectangle;
-
-    private readonly int _originalIndex;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region Date
-
-    public DateTime Date
-    {
-      get
-      {
-        return _date;
-      }
-    }
-
-    private readonly DateTime _date;
-
-    #endregion
-
-    #region DateEnd
-
-    public DateTime DateEnd
-    {
-      get
-      {
-        return _dateEnd;
-      }
-    }
-
-    private readonly DateTime _dateEnd;
-
-    #endregion
-
-    #region Element
-
-    public UIElement Element
-    {
-      get
-      {
-        return _element;
-      }
-    }
-
-    private readonly UIElement _element;
-
-    #endregion
-
-    #endregion
-
-    #region Constructors
-
-    internal DateElement( UIElement element, DateTime date, DateTime dateEnd )
-      : this( element, date, dateEnd, -1 )
-    {
-    }
-
-    internal DateElement( UIElement element, DateTime date, DateTime dateEnd, int originalIndex )
-    {
-      _element = element;
-      _date = date;
-      _dateEnd = dateEnd;
-      _originalIndex = originalIndex;
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override string ToString()
-    {
-      var fe = this.Element as FrameworkElement;
-      if( fe == null )
-        return base.ToString();
-
-      if( fe.Tag != null )
-        return fe.Tag.ToString();
-
-      return fe.Name;
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Methods
-
-    public int CompareTo( DateElement d )
-    {
-      int dateCompare = this.Date.CompareTo( d.Date );
-      if( dateCompare != 0 )
-        return dateCompare;
-
-      if( _originalIndex >= 0 )
-        return ( _originalIndex < d._originalIndex ) ? -1 : 1;
-
-      return -this.DateEnd.CompareTo( d.DateEnd );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
deleted file mode 100644
index f2f56c57..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum OverlapBehavior
-  {
-    Stack,
-    Stretch,
-    Hide,
-    None
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
deleted file mode 100644
index 3070064a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
+++ /dev/null
@@ -1,1322 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class TimelinePanel : Panel, IScrollInfo
-  {
-    #region Members
-
-    private List<DateElement> _visibleElements = null;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region BeginDate Property
-
-    public static readonly DependencyProperty BeginDateProperty = DependencyProperty.Register( "BeginDate", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public DateTime BeginDate
-    {
-      get
-      {
-        return ( DateTime )GetValue( BeginDateProperty );
-      }
-      set
-      {
-        SetValue( BeginDateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EndDate Property
-
-    public static readonly DependencyProperty EndDateProperty = DependencyProperty.Register( "EndDate", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public DateTime EndDate
-    {
-      get
-      {
-        return ( DateTime )GetValue( EndDateProperty );
-      }
-      set
-      {
-        SetValue( EndDateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region OverlapBehavior Property
-
-    public static readonly DependencyProperty OverlapBehaviorProperty = DependencyProperty.Register( "OverlapBehavior", typeof( OverlapBehavior ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( default( OverlapBehavior ), FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public OverlapBehavior OverlapBehavior
-    {
-      get
-      {
-        return ( OverlapBehavior )GetValue( OverlapBehaviorProperty );
-      }
-      set
-      {
-        SetValue( OverlapBehaviorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region KeepOriginalOrderForOverlap Property
-
-    public static readonly DependencyProperty KeepOriginalOrderForOverlapProperty = DependencyProperty.Register( "KeepOriginalOrderForOverlap", typeof( bool ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public bool KeepOriginalOrderForOverlap
-    {
-      get
-      {
-        return ( bool )GetValue( KeepOriginalOrderForOverlapProperty );
-      }
-      set
-      {
-        SetValue( KeepOriginalOrderForOverlapProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Orientation Property
-
-    public static readonly DependencyProperty OrientationProperty = StackPanel.OrientationProperty.AddOwner( typeof( TimelinePanel ), new FrameworkPropertyMetadata( Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public Orientation Orientation
-    {
-      get
-      {
-        return ( Orientation )GetValue( OrientationProperty );
-      }
-      set
-      {
-        SetValue( OrientationProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region UnitTimeSpan Property
-
-    public static readonly DependencyProperty UnitTimeSpanProperty = DependencyProperty.Register( "UnitTimeSpan", typeof( TimeSpan ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( TimeSpan.Zero, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public TimeSpan UnitTimeSpan
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( UnitTimeSpanProperty );
-      }
-      set
-      {
-        SetValue( UnitTimeSpanProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region UnitSize Property
-
-    public static readonly DependencyProperty UnitSizeProperty = DependencyProperty.Register( "UnitSize", typeof( double ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public double UnitSize
-    {
-      get
-      {
-        return ( double )GetValue( UnitSizeProperty );
-      }
-      set
-      {
-        SetValue( UnitSizeProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Date Attached Property
-
-    public static readonly DependencyProperty DateProperty = DependencyProperty.RegisterAttached( "Date", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsParentMeasure ) );
-
-    public static DateTime GetDate( DependencyObject obj )
-    {
-      return ( DateTime )obj.GetValue( DateProperty );
-    }
-
-    public static void SetDate( DependencyObject obj, DateTime value )
-    {
-      obj.SetValue( DateProperty, value );
-    }
-
-    #endregion
-
-    #region DateEnd Attached Property
-
-    public static readonly DependencyProperty DateEndProperty = DependencyProperty.RegisterAttached( "DateEnd", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsParentMeasure ) );
-
-    public static DateTime GetDateEnd( DependencyObject obj )
-    {
-      return ( DateTime )obj.GetValue( DateEndProperty );
-    }
-
-    public static void SetDateEnd( DependencyObject obj, DateTime value )
-    {
-      obj.SetValue( DateEndProperty, value );
-    }
-
-    #endregion
-
-    public List<DateElement> VisibleElements
-    {
-      get
-      {
-        return _visibleElements;
-      }
-    }
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static TimelinePanel()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimelinePanel ), new FrameworkPropertyMetadata( typeof( TimelinePanel ) ) );
-    }
-
-    public TimelinePanel()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      DateTime calcBeginDate = DateTime.MaxValue;
-      DateTime calcEndDate = DateTime.MinValue;
-
-      foreach( UIElement child in InternalChildren )
-      {
-        DateTime date = GetDate( child );
-        DateTime dateEnd = GetDateEnd( child );
-
-        if( date < calcBeginDate )
-        {
-          calcBeginDate = date;
-        }
-
-        if( date > calcEndDate )
-        {
-          calcEndDate = date;
-        }
-
-        if( dateEnd > calcEndDate )
-        {
-          calcEndDate = dateEnd;
-        }
-      }
-
-      if( BeginDate == DateTime.MinValue )
-      {
-        BeginDate = calcBeginDate;
-      }
-
-      if( EndDate == DateTime.MinValue )
-      {
-        EndDate = calcEndDate;
-      }
-
-      foreach( UIElement child in InternalChildren )
-      {
-        DateTime date = GetDate( child );
-        DateTime dateEnd = GetDateEnd( child );
-
-        Size childSize = availableSize;
-
-        if( dateEnd > DateTime.MinValue && dateEnd > date )
-        {
-          if( Orientation == Orientation.Horizontal )
-          {
-            if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
-            {
-              double size = ( double )( dateEnd.Ticks - date.Ticks ) / ( double )UnitTimeSpan.Ticks;
-
-              childSize.Width = size * UnitSize;
-            }
-            else if( !double.IsPositiveInfinity( availableSize.Width ) )
-            {
-              // width is DateEnd - Date
-              childSize.Width = CalculateTimelineOffset( dateEnd, availableSize.Width ) - CalculateTimelineOffset( date, availableSize.Width );
-            }
-          }
-          else
-          {
-            if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
-            {
-              double size = ( double )( dateEnd.Ticks - date.Ticks ) / ( double )UnitTimeSpan.Ticks;
-
-              childSize.Height = size * UnitSize;
-            }
-            else if( !double.IsPositiveInfinity( availableSize.Height ) )
-            {
-              // height is DateEnd - Date
-              childSize.Height = CalculateTimelineOffset( dateEnd, availableSize.Height ) - CalculateTimelineOffset( date, availableSize.Height );
-            }
-          }
-        }
-
-        child.Measure( childSize );
-      }
-
-      Size newAvailableSize = new Size( availableSize.Width, availableSize.Height );
-
-      if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
-      {
-        double size = ( double )( EndDate.Ticks - BeginDate.Ticks ) / ( double )UnitTimeSpan.Ticks;
-
-        if( Orientation == Orientation.Horizontal )
-        {
-          newAvailableSize.Width = size * UnitSize;
-        }
-        else
-        {
-          newAvailableSize.Height = size * UnitSize;
-        }
-      }
-
-      Size desiredSize = new Size();
-
-      if( ( Orientation == Orientation.Vertical && double.IsPositiveInfinity( newAvailableSize.Height ) ) ||
-          ( Orientation == Orientation.Horizontal && double.IsPositiveInfinity( newAvailableSize.Width ) ) )
-      {
-        // Our panel cannot layout items when we have positive infinity in the layout direction
-        // so defer to arrange pass.
-        _visibleElements = null;
-      }
-      else
-      {
-        LayoutItems( InternalChildren, newAvailableSize );
-
-        Rect desiredRect = new Rect();
-
-        foreach( DateElement child in _visibleElements )
-        {
-          desiredRect.Union( child.PlacementRectangle );
-        }
-
-        if( Orientation == Orientation.Horizontal )
-        {
-          desiredSize.Width = newAvailableSize.Width;
-          desiredSize.Height = desiredRect.Size.Height;
-        }
-        else
-        {
-          desiredSize.Width = desiredRect.Size.Width;
-          desiredSize.Height = newAvailableSize.Height;
-        }
-      }
-
-      if( IsScrolling )
-      {
-        Size viewport = new Size( availableSize.Width, availableSize.Height );
-        Size extent = new Size( desiredSize.Width, desiredSize.Height );
-        Vector offset = new Vector( Math.Max( 0, Math.Min( _offset.X, extent.Width - viewport.Width ) ),
-                                    Math.Max( 0, Math.Min( _offset.Y, extent.Height - viewport.Height ) ) );
-
-        SetScrollingData( viewport, extent, offset );
-
-        desiredSize.Width = Math.Min( desiredSize.Width, availableSize.Width );
-        desiredSize.Height = Math.Min( desiredSize.Height, availableSize.Height );
-
-        _physicalViewport = availableSize;
-      }
-
-      return desiredSize;
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      Rect finalRect = new Rect();
-
-      if( _visibleElements == null )
-      {
-        LayoutItems( InternalChildren, finalSize );
-      }
-
-      foreach( DateElement child in _visibleElements )
-      {
-        if( IsScrolling )
-        {
-          Rect placement = new Rect( child.PlacementRectangle.Location, child.PlacementRectangle.Size );
-          placement.Offset( -_offset );
-
-          child.Element.Arrange( placement );
-        }
-        else
-        {
-          child.Element.Arrange( child.PlacementRectangle );
-        }
-
-        finalRect.Union( child.PlacementRectangle );
-      }
-
-      Size renderSize;
-
-      if( Orientation == Orientation.Horizontal )
-      {
-        renderSize = new Size( finalSize.Width, finalRect.Size.Height );
-      }
-      else
-      {
-        renderSize = new Size( finalRect.Size.Width, finalSize.Height );
-      }
-
-      return renderSize;
-    }
-
-
-    #endregion //Base Class Overrides
-
-    #region Methods
-
-    private void ResetScrollInfo()
-    {
-      _offset = new Vector();
-      _physicalViewport = _viewport = _extent = new Size( 0, 0 );
-    }
-
-    private void SetScrollingData( Size viewport, Size extent, Vector offset )
-    {
-      _offset = offset;
-
-      if( !AreVirtuallyEqual( viewport, _viewport ) ||
-          !AreVirtuallyEqual( extent, _extent ) ||
-          !AreVirtuallyEqual( offset, _computedOffset ) )
-      {
-        _viewport = viewport;
-        _extent = extent;
-        _offset = offset;
-
-        OnScrollChange();
-      }
-    }
-
-    private double ValidateInputOffset( double offset, string parameterName )
-    {
-      if( double.IsNaN( offset ) )
-        throw new ArgumentOutOfRangeException( parameterName );
-
-      return Math.Max( 0d, offset );
-    }
-
-    private void OnScrollChange()
-    {
-      if( ScrollOwner != null )
-      {
-        ScrollOwner.InvalidateScrollInfo();
-      }
-    }
-
-    private double CalculateTimelineOffset( DateTime d, double finalWidth )
-    {
-      double offset;
-
-      long tickRange = EndDate.Ticks - BeginDate.Ticks;
-      long tickOffset = d.Ticks - BeginDate.Ticks;
-
-      if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
-      {
-        offset = ( ( double )tickOffset / ( double )UnitTimeSpan.Ticks ) * UnitSize;
-      }
-      else
-      {
-        if( tickRange > 0 )
-        {
-          offset = ( ( double )tickOffset / ( double )tickRange ) * finalWidth;
-        }
-        else
-        {
-          offset = 0;
-        }
-      }
-
-      return offset;
-    }
-
-    private static int CompareElementsByLeft( DateElement a, DateElement b )
-    {
-      return a.PlacementRectangle.Left.CompareTo( b.PlacementRectangle.Left );
-    }
-
-    private static int CompareElementsByTop( DateElement a, DateElement b )
-    {
-      return a.PlacementRectangle.Top.CompareTo( b.PlacementRectangle.Top );
-    }
-
-    private void LayoutItems( UIElementCollection children, Size availableSize )
-    {
-      _visibleElements = new List<DateElement>();
-      List<DateElement> overlappingElements = new List<DateElement>();
-
-      int index = 0;
-      foreach( UIElement child in children )
-      {
-        if( child == null )
-          continue;
-
-        DateTime date = GetDate( child );
-        DateTime dateEnd = GetDateEnd( child );
-
-        if( child.Visibility != Visibility.Collapsed )
-        {
-          if( KeepOriginalOrderForOverlap )
-          {
-            _visibleElements.Add( new DateElement( child, date, dateEnd, index ) );
-          }
-          else
-          {
-            _visibleElements.Add( new DateElement( child, date, dateEnd ) );
-          }
-        }
-
-        index++;
-      }
-
-      _visibleElements.Sort();
-
-      foreach( DateElement child in _visibleElements )
-      {
-        DateTime date = GetDate( child.Element );
-        DateTime dateEnd = GetDateEnd( child.Element );
-
-        if( Orientation == Orientation.Vertical )
-        {
-
-          //---------------------------------------------------------------------
-          // 
-          // Begin Layout Algorithm (Vertical Orientation)
-          //
-          //---------------------------------------------------------------------
-
-          // calculate the values for y (top) and height
-
-          // y
-          child.PlacementRectangle.Y = CalculateTimelineOffset( date, availableSize.Height );
-
-          // height
-          if( dateEnd > DateTime.MinValue && dateEnd > date )
-          {
-            // height is DateEnd - Date
-            child.PlacementRectangle.Height = CalculateTimelineOffset( dateEnd, availableSize.Height ) - CalculateTimelineOffset( date, availableSize.Height );
-          }
-          else
-          {
-            // height is the desired size
-            child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
-          }
-
-          // now calcualte the values for x (left) and width based on the OverlapBehavior
-
-          switch( OverlapBehavior )
-          {
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == None (Vertical)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.None:
-
-              #region OverlapBehavior == None (Vertical)
-
-              child.PlacementRectangle.X = 0;
-              child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Hide (Vertical)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Hide:
-
-              #region OverlapBehavior = Hide
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              if( overlappingElements.Count > 0 )
-              {
-                child.PlacementRectangle.X = 0;
-                child.PlacementRectangle.Y = 0;
-                child.PlacementRectangle.Width = 0;
-                child.PlacementRectangle.Height = 0;
-              }
-              else
-              {
-                child.PlacementRectangle.X = 0;
-                child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
-              }
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Stretch (Vertical)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Stretch:
-
-              #region OverlapBehavior = Stretch
-
-              // find the first gap at the desired vertical (Y) location (note that in doing this, we 
-              // only need to look for elements that intersect at the "top" of the item that is being
-              // placed because the _VisibleElements collection has been sorted so that the first 
-              // items come first--this means there won't be anything "below" the current item that
-              // isn't also below the current item
-
-              // find all overlapping elements
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              // sort the elements according to their "left" value so that as we search through
-              // the list we are able to identiy gaps
-
-              overlappingElements.Sort( CompareElementsByLeft );
-
-              // initialize left and width such that the item will be stretch to fill the available 
-              // space and if there are no overlapping items, skip to the end
-
-              double left = 0;
-              double width = availableSize.Width;
-
-              if( overlappingElements.Count > 0 )
-              {
-
-                bool foundGap = false;
-
-                // now, look for a gap (there is a good chance that there won't be one, but if there is 
-                // then we will place the item in it)
-
-                for( int i = 0; i < overlappingElements.Count; i++ )
-                {
-                  Rect r = overlappingElements[ i ].PlacementRectangle;
-
-                  // if this is the first overlapping element, then look for a gap at the beginning
-                  if( i == 0 )
-                  {
-                    if( r.Left > 0 )
-                    {
-                      left = 0;
-                      width = r.Left;
-                      foundGap = true;
-                      break;
-                    }
-                  }
-
-                  // if this is the last overlapping element
-                  if( i == overlappingElements.Count - 1 )
-                  {
-                    //left = r.Right;
-                    break;
-                  }
-
-                  // if this is an element somewhere in the middle, then 
-                  else
-                  {
-                    Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
-                    if( ( n.Left - r.Right ) > 0 )
-                    {
-                      left = r.Right;
-                      width = n.Left - r.Right;
-                      foundGap = true;
-                      break;
-                    }
-                  }
-
-                }
-
-                // if we didn't find a gap, we need to make one by scooting the overlapping elements 
-                // over and then placing the item at the end
-
-                if( !foundGap )
-                {
-                  width = Math.Min( availableSize.Width / ( overlappingElements.Count + 1 ), overlappingElements[ 0 ].PlacementRectangle.Width );
-                  left = 0;
-
-                  foreach( DateElement e in overlappingElements )
-                  {
-                    e.PlacementRectangle.Width = width;
-                    e.PlacementRectangle.X = left;
-                    left += width;
-                  }
-                }
-              }
-
-              child.PlacementRectangle.X = left;
-
-              if( double.IsPositiveInfinity( width ) )
-              {
-                child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
-              }
-              else
-              {
-                child.PlacementRectangle.Width = width;
-              }
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Stack (Vertical)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Stack:
-
-              #region OverlapBehavior = Stack;
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              // sort the elements according to their "left" value so that as we search through
-              // the list we are able to identiy gaps
-
-              overlappingElements.Sort( CompareElementsByLeft );
-
-              // initialize left and width values, width will always be it's desired size
-
-              left = 0;
-              child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
-
-              // find the first gap that is big enough to accomodate the current item
-
-              for( int i = 0; i < overlappingElements.Count; i++ )
-              {
-                Rect r = overlappingElements[ i ].PlacementRectangle;
-
-                if( i == 0 )
-                {
-                  if( r.Left >= child.PlacementRectangle.Width )
-                  {
-                    left = 0;
-                    break;
-                  }
-                }
-
-                if( i == overlappingElements.Count - 1 )
-                {
-                  left = r.Right;
-                  break;
-                }
-                else
-                {
-                  Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
-                  if( ( n.Left - r.Right ) >= child.PlacementRectangle.Width )
-                  {
-                    left = r.Right;
-                    break;
-                  }
-                }
-              }
-
-              child.PlacementRectangle.X = left;
-
-              break;
-
-              #endregion
-          }
-        }
-        else
-        {
-          //---------------------------------------------------------------------
-          // 
-          // Begin Layout Algorithm (Horizontal Orientation)
-          //
-          //---------------------------------------------------------------------
-
-          // calculate the values for x (left) and width
-
-          // x
-          child.PlacementRectangle.X = CalculateTimelineOffset( date, availableSize.Width );
-
-          // width
-          if( dateEnd > DateTime.MinValue && dateEnd > date )
-          {
-            // width is DateEnd - Date
-            child.PlacementRectangle.Width = CalculateTimelineOffset( dateEnd, availableSize.Width ) - CalculateTimelineOffset( date, availableSize.Width );
-          }
-          else
-          {
-            // width is the desired size
-            child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
-          }
-
-          // now calcualte the values for y (top) and height based on the OverlapBehavior
-
-          switch( OverlapBehavior )
-          {
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == None (Horizontal)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.None:
-
-              #region OverlapBehavior == None (Horizontal)
-
-              child.PlacementRectangle.Y = 0;
-              child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Hide (Horizontal)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Hide:
-
-              #region OverlapBehavior = Hide (Horizontal)
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              if( overlappingElements.Count > 0 )
-              {
-                child.PlacementRectangle.X = 0;
-                child.PlacementRectangle.Y = 0;
-                child.PlacementRectangle.Width = 0;
-                child.PlacementRectangle.Height = 0;
-              }
-              else
-              {
-                child.PlacementRectangle.Y = 0;
-                child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
-              }
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Stretch (Horizontal)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Stretch:
-
-              #region OverlapBehavior = Stretch
-
-              // find the first gap at the desired vertical (Y) location (note that in doing this, we 
-              // only need to look for elements that intersect at the "top" of the item that is being
-              // placed because the _VisibleElements collection has been sorted so that the first 
-              // items come first--this means there won't be anything "below" the current item that
-              // isn't also below the current item
-
-              // find all overlapping elements
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              // sort the elements according to their "left" value so that as we search through
-              // the list we are able to identiy gaps
-
-              overlappingElements.Sort( CompareElementsByTop );
-
-              // initialize left and width such that the item will be stretch to fill the available 
-              // space and if there are no overlapping items, skip to the end
-
-              double top = 0;
-              double height = availableSize.Height;
-
-              if( overlappingElements.Count > 0 )
-              {
-
-                bool foundGap = false;
-
-                // now, look for a gap (there is a good chance that there won't be one, but if there is 
-                // then we will place the item in it)
-
-                for( int i = 0; i < overlappingElements.Count; i++ )
-                {
-                  Rect r = overlappingElements[ i ].PlacementRectangle;
-
-                  // if this is the first overlapping element, then look for a gap at the beginning
-                  if( i == 0 )
-                  {
-                    if( r.Top > 0 )
-                    {
-                      top = 0;
-                      height = r.Top;
-                      foundGap = true;
-                      break;
-                    }
-                  }
-
-                  // if this is the last overlapping element
-                  if( i == overlappingElements.Count - 1 )
-                  {
-                    //left = r.Right;
-                    break;
-                  }
-
-                  // if this is an element somewhere in the middle, then 
-                  else
-                  {
-                    Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
-                    if( ( n.Top - r.Bottom ) > 0 )
-                    {
-                      top = r.Bottom;
-                      height = n.Top - r.Bottom;
-                      foundGap = true;
-                      break;
-                    }
-                  }
-
-                }
-
-                // if we didn't find a gap, we need to make one by scooting the overlapping elements 
-                // over and then placing the item at the end
-
-                if( !foundGap )
-                {
-                  height = Math.Min( availableSize.Height / ( overlappingElements.Count + 1 ), overlappingElements[ 0 ].PlacementRectangle.Height );
-                  top = 0;
-
-                  foreach( DateElement e in overlappingElements )
-                  {
-                    e.PlacementRectangle.Height = height;
-                    e.PlacementRectangle.Y = top;
-                    top += height;
-                  }
-                }
-              }
-
-              child.PlacementRectangle.Y = top;
-
-              if( double.IsPositiveInfinity( height ) )
-              {
-                child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
-              }
-              else
-              {
-                child.PlacementRectangle.Height = height;
-              }
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Stack (Horizontal)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Stack:
-
-              #region OverlapBehavior = Stack;
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              // sort the elements according to their "left" value so that as we search through
-              // the list we are able to identiy gaps
-
-              overlappingElements.Sort( CompareElementsByTop );
-
-              // initialize left and width values, width will always be it's desired size
-
-              top = 0;
-              child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
-
-              // find the first gap that is big enough to accomodate the current item
-
-              for( int i = 0; i < overlappingElements.Count; i++ )
-              {
-                Rect r = overlappingElements[ i ].PlacementRectangle;
-
-                if( i == 0 )
-                {
-                  if( r.Top >= child.PlacementRectangle.Height )
-                  {
-                    top = 0;
-                    break;
-                  }
-                }
-
-                if( i == overlappingElements.Count - 1 )
-                {
-                  top = r.Bottom;
-                  break;
-                }
-                else
-                {
-                  Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
-                  if( ( n.Top - r.Bottom ) >= child.PlacementRectangle.Height )
-                  {
-                    top = r.Bottom;
-                    break;
-                  }
-                }
-              }
-
-              child.PlacementRectangle.Y = top;
-
-              break;
-
-              #endregion
-          }
-        }
-      }
-    }
-
-    private static bool AreVirtuallyEqual( double d1, double d2 )
-    {
-      if( double.IsPositiveInfinity( d1 ) )
-        return double.IsPositiveInfinity( d2 );
-
-      if( double.IsNegativeInfinity( d1 ) )
-        return double.IsNegativeInfinity( d2 );
-
-      if( double.IsNaN( d1 ) )
-        return double.IsNaN( d2 );
-
-      double n = d1 - d2;
-      double d = ( Math.Abs( d1 ) + Math.Abs( d2 ) + 10 ) * 1.0e-15;
-      return ( -d < n ) && ( d > n );
-    }
-
-    private static bool AreVirtuallyEqual( Size s1, Size s2 )
-    {
-      return AreVirtuallyEqual( s1.Width, s2.Width )
-          && AreVirtuallyEqual( s1.Height, s2.Height );
-    }
-
-    private static bool AreVirtuallyEqual( Vector v1, Vector v2 )
-    {
-      return AreVirtuallyEqual( v1.X, v2.X )
-          && AreVirtuallyEqual( v1.Y, v2.Y );
-    }
-
-    #endregion //Methods
-
-    #region Interfaces
-
-    #region IScrollInfo
-
-    public bool CanHorizontallyScroll
-    {
-      get
-      {
-        return _allowHorizontal;
-      }
-      set
-      {
-        _allowHorizontal = value;
-      }
-    }
-
-    public bool CanVerticallyScroll
-    {
-      get
-      {
-        return _allowVertical;
-      }
-      set
-      {
-        _allowVertical = value;
-      }
-    }
-
-    public double ExtentHeight
-    {
-      get
-      {
-        return _extent.Height;
-      }
-    }
-
-    public double ExtentWidth
-    {
-      get
-      {
-        return _extent.Width;
-      }
-    }
-
-    public double HorizontalOffset
-    {
-      get
-      {
-        return _offset.X;
-      }
-    }
-
-    public void LineDown()
-    {
-      SetVerticalOffset( VerticalOffset + ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) );
-    }
-
-    public void LineLeft()
-    {
-      SetHorizontalOffset( HorizontalOffset - ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) );
-    }
-
-    public void LineRight()
-    {
-      SetHorizontalOffset( HorizontalOffset + ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) );
-    }
-
-    public void LineUp()
-    {
-      SetVerticalOffset( VerticalOffset - ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) );
-    }
-
-    public Rect MakeVisible( Visual visual, Rect rectangle )
-    {
-      return rectangle;
-    }
-
-    public void MouseWheelDown()
-    {
-      SetVerticalOffset( VerticalOffset + ( SystemParameters.WheelScrollLines * ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) ) );
-    }
-
-    public void MouseWheelLeft()
-    {
-      SetHorizontalOffset( HorizontalOffset - ( 3d * ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) ) );
-    }
-
-    public void MouseWheelRight()
-    {
-      SetHorizontalOffset( HorizontalOffset + ( 3d * ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) ) );
-    }
-
-    public void MouseWheelUp()
-    {
-      SetVerticalOffset( VerticalOffset - ( SystemParameters.WheelScrollLines * ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) ) );
-    }
-
-    public void PageDown()
-    {
-      SetVerticalOffset( VerticalOffset + ViewportHeight );
-    }
-
-    public void PageLeft()
-    {
-      SetHorizontalOffset( HorizontalOffset - ViewportWidth );
-    }
-
-    public void PageRight()
-    {
-      SetHorizontalOffset( HorizontalOffset + ViewportWidth );
-    }
-
-    public void PageUp()
-    {
-      SetVerticalOffset( VerticalOffset - ViewportHeight );
-    }
-
-    public ScrollViewer ScrollOwner
-    {
-      get
-      {
-        return _scrollOwner;
-      }
-      set
-      {
-        if( _scrollOwner != value )
-        {
-          _scrollOwner = value;
-
-          ResetScrollInfo();
-        }
-      }
-    }
-
-    public void SetHorizontalOffset( double offset )
-    {
-      offset = ValidateInputOffset( offset, "HorizontalOffset" );
-
-      if( !AreVirtuallyEqual( offset, _offset.X ) )
-      {
-        _offset.X = offset;
-
-        InvalidateMeasure();
-      }
-    }
-
-    public void SetVerticalOffset( double offset )
-    {
-      offset = ValidateInputOffset( offset, "VerticalOffset" );
-
-      if( !AreVirtuallyEqual( offset, _offset.Y ) )
-      {
-        _offset.Y = offset;
-
-        InvalidateMeasure();
-      }
-    }
-
-    public double VerticalOffset
-    {
-      get
-      {
-        return _offset.Y;
-      }
-    }
-
-    public double ViewportHeight
-    {
-      get
-      {
-        return _viewport.Height;
-      }
-    }
-
-    public double ViewportWidth
-    {
-      get
-      {
-        return _viewport.Width;
-      }
-    }
-
-    private bool IsScrolling
-    {
-      get
-      {
-        return ( _scrollOwner != null );
-      }
-    }
-
-    private bool _allowHorizontal = false;
-    private bool _allowVertical = false;
-    private Vector _computedOffset = new Vector( 0d, 0d );
-    private Size _extent = new Size( 0, 0 );
-    private Vector _offset = new Vector( 0, 0 );
-    private ScrollViewer _scrollOwner = null;
-    private Size _viewport;
-    private Size _physicalViewport;
-
-    #endregion //IScrollInfo
-
-    #endregion //Interfaces
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs
deleted file mode 100644
index 145e2092..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal static partial class VisualStates
-  {
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
deleted file mode 100644
index 0a61abfe..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class WatermarkComboBox : ComboBox
-  {
-    #region Properties
-
-    #region Watermark
-
-    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( WatermarkComboBox ), new UIPropertyMetadata( null ) );
-    public object Watermark
-    {
-      get
-      {
-        return ( object )GetValue( WatermarkProperty );
-      }
-      set
-      {
-        SetValue( WatermarkProperty, value );
-      }
-    }
-
-    #endregion //Watermark
-
-    #region WatermarkTemplate
-
-    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( WatermarkComboBox ), new UIPropertyMetadata( null ) );
-    public DataTemplate WatermarkTemplate
-    {
-      get
-      {
-        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
-      }
-      set
-      {
-        SetValue( WatermarkTemplateProperty, value );
-      }
-    }
-
-    #endregion //WatermarkTemplate
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static WatermarkComboBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( WatermarkComboBox ), new FrameworkPropertyMetadata( typeof( WatermarkComboBox ) ) );
-    }
-
-    public WatermarkComboBox()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-
-
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index f0f4b933..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,477 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                    Focusable="False" />
-  </DataTemplate>
-
-  <!-- =============================================================================== -->
-  <!-- WatermarkTextBox Template                                                       -->
-  <!-- =============================================================================== -->
-  <ControlTemplate x:Key="WatermarkComboBoxTemplate"
-                   TargetType="{x:Type local:WatermarkComboBox}">
-    <Grid x:Name="templateRoot"
-          SnapsToDevicePixels="True">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"
-                          Width="0" />
-      </Grid.ColumnDefinitions>
-      <Popup x:Name="PART_Popup"
-             AllowsTransparency="True"
-             Grid.ColumnSpan="2"
-             IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-             Margin="1"
-             PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
-             Placement="Bottom">
-        <Grid x:Name="DropDown"
-              MaxHeight="{TemplateBinding MaxDropDownHeight}"
-              MinWidth="{TemplateBinding ActualWidth}"
-              SnapsToDevicePixels="True">
-          <Border x:Name="DropDownBorder"
-                  BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
-                  BorderThickness="1"
-                  Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-            <ScrollViewer x:Name="DropDownScrollViewer">
-              <Grid x:Name="grid">
-                <Canvas x:Name="canvas"
-                        HorizontalAlignment="Left"
-                        Height="0"
-                        VerticalAlignment="Top"
-                        Width="0">
-                  <Rectangle x:Name="OpaqueRect"
-                             Fill="{Binding Background, ElementName=DropDownBorder}"
-                             Height="{Binding ActualHeight, ElementName=DropDownBorder}"
-                             Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
-                </Canvas>
-                <ItemsPresenter x:Name="ItemsPresenter"
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </Grid>
-            </ScrollViewer>
-          </Border>
-        </Grid>
-      </Popup>
-      <ToggleButton x:Name="toggleButton"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    Grid.ColumnSpan="2"
-                    IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
-        <ToggleButton.Style>
-          <Style TargetType="{x:Type ToggleButton}">
-            <Setter Property="OverridesDefaultStyle"
-                    Value="True" />
-            <Setter Property="IsTabStop"
-                    Value="False" />
-            <Setter Property="Focusable"
-                    Value="False" />
-            <Setter Property="ClickMode"
-                    Value="Press" />
-            <Setter Property="Template">
-              <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                  <Border x:Name="templateRoot"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          SnapsToDevicePixels="True">
-                    <Border.Background>
-                      <LinearGradientBrush EndPoint="0,1"
-                                           StartPoint="0,0">
-                        <GradientStop Color="#FFF0F0F0"
-                                      Offset="0" />
-                        <GradientStop Color="#FFE5E5E5"
-                                      Offset="1" />
-                      </LinearGradientBrush>
-                    </Border.Background>
-                    <Border x:Name="splitBorder"
-                            BorderBrush="Transparent"
-                            BorderThickness="1"
-                            HorizontalAlignment="Right"
-                            Margin="0"
-                            SnapsToDevicePixels="True"
-                            Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                      <Path x:Name="Arrow"
-                            Data="F1M0,0L2.667,2.66665 5.3334,0 5.3334,-1.78168 2.6667,0.88501 0,-1.78168 0,0z"
-                            Fill="#FF606060"
-                            HorizontalAlignment="Center"
-                            Margin="0"
-                            VerticalAlignment="Center" />
-                    </Border>
-                  </Border>
-                  <ControlTemplate.Triggers>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsMouseOver"
-                             Value="True">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="Black" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFECF4FC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFDCECFC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF7EB4EA" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF7EB4EA" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFEBF4FC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFDCECFC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="#FF7EB4EA" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsPressed"
-                             Value="True">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="Black" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFDAECFC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFC4E0FC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF569DE5" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF569DE5" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFDAEBFC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFC4E0FC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="#FF569DE5" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsEnabled"
-                             Value="False">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="#FFBFBFBF" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="#FFF0F0F0" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FFD9D9D9" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FFBFBFBF" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                    </MultiDataTrigger>
-                  </ControlTemplate.Triggers>
-                </ControlTemplate>
-              </Setter.Value>
-            </Setter>
-          </Style>
-        </ToggleButton.Style>
-      </ToggleButton>
-      <ContentPresenter x:Name="contentPresenter"
-                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                        Content="{TemplateBinding SelectionBoxItem}"
-                        ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        IsHitTestVisible="False"
-                        Margin="{TemplateBinding Padding}"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-      <Border x:Name="Border"
-              Background="White"
-              Margin="{TemplateBinding BorderThickness}"
-              Visibility="Collapsed">
-        <TextBox x:Name="PART_EditableTextBox"
-                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                 IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                 Margin="{TemplateBinding Padding}"
-                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-          <TextBox.Style>
-            <Style TargetType="{x:Type TextBox}">
-              <Setter Property="OverridesDefaultStyle"
-                      Value="True" />
-              <Setter Property="AllowDrop"
-                      Value="True" />
-              <Setter Property="MinWidth"
-                      Value="0" />
-              <Setter Property="MinHeight"
-                      Value="0" />
-              <Setter Property="FocusVisualStyle"
-                      Value="{x:Null}" />
-              <Setter Property="Stylus.IsFlicksEnabled"
-                      Value="False" />
-              <Setter Property="Template">
-                <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type TextBox}">
-                    <ScrollViewer x:Name="PART_ContentHost"
-                                  Background="Transparent"
-                                  Focusable="False"
-                                  HorizontalScrollBarVisibility="Hidden"
-                                  VerticalScrollBarVisibility="Hidden" />
-                  </ControlTemplate>
-                </Setter.Value>
-              </Setter>
-            </Style>
-          </TextBox.Style>
-        </TextBox>
-      </Border>
-      <ContentPresenter x:Name="PART_WatermarkHost"
-                        Content="{TemplateBinding Watermark}"
-                        ContentTemplate="{TemplateBinding WatermarkTemplate}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        IsHitTestVisible="False"
-                        Margin="{TemplateBinding Padding}"
-                        Visibility="Collapsed" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems"
-               Value="False">
-        <Setter Property="Height"
-                TargetName="DropDownBorder"
-                Value="95" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping"
-                     Value="True" />
-          <!--<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping"
-                          Value="False" />-->
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll"
-                Value="False" />
-      </MultiTrigger>
-      <Trigger Property="CanContentScroll"
-               SourceName="DropDownScrollViewer"
-               Value="False">
-        <Setter Property="Canvas.Top"
-                TargetName="OpaqueRect"
-                Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}" />
-        <Setter Property="Canvas.Left"
-                TargetName="OpaqueRect"
-                Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}" />
-      </Trigger>
-      <Trigger Property="IsEditable"
-               Value="True">
-        <Setter Property="IsTabStop"
-                Value="False" />
-        <Setter Property="Padding"
-                Value="2" />
-        <Setter Property="Visibility"
-                Value="Visible"
-                TargetName="Border" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="contentPresenter" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="Text"
-                     Value="" />
-        </MultiTrigger.Conditions>
-        <MultiTrigger.Setters>
-          <Setter Property="Visibility"
-                  TargetName="PART_WatermarkHost"
-                  Value="Visible" />
-        </MultiTrigger.Setters>
-      </MultiTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- =============================================================================== -->
-  <!-- WatermarkTextBox Style                                                          -->
-  <!-- =============================================================================== -->
-
-  <Style x:Key="WatermarkComboBox"
-         TargetType="{x:Type local:WatermarkComboBox}">
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Margin="2"
-                           SnapsToDevicePixels="True"
-                           Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                           StrokeThickness="1"
-                           StrokeDashArray="1 2" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background">
-      <Setter.Value>
-        <LinearGradientBrush EndPoint="0,1"
-                             StartPoint="0,0">
-          <GradientStop Color="#FFF0F0F0"
-                        Offset="0" />
-          <GradientStop Color="#FFE5E5E5"
-                        Offset="1" />
-        </LinearGradientBrush>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="BorderBrush"
-            Value="#FFACACAC" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="Padding"
-            Value="6,3,5,3" />
-    <Setter Property="ScrollViewer.CanContentScroll"
-            Value="True" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template"
-            Value="{StaticResource WatermarkComboBoxTemplate}" />
-  </Style>
-
-  <Style TargetType="{x:Type local:WatermarkComboBox}"
-         BasedOn="{StaticResource WatermarkComboBox}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
deleted file mode 100644
index f0f4b933..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,477 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                    Focusable="False" />
-  </DataTemplate>
-
-  <!-- =============================================================================== -->
-  <!-- WatermarkTextBox Template                                                       -->
-  <!-- =============================================================================== -->
-  <ControlTemplate x:Key="WatermarkComboBoxTemplate"
-                   TargetType="{x:Type local:WatermarkComboBox}">
-    <Grid x:Name="templateRoot"
-          SnapsToDevicePixels="True">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"
-                          Width="0" />
-      </Grid.ColumnDefinitions>
-      <Popup x:Name="PART_Popup"
-             AllowsTransparency="True"
-             Grid.ColumnSpan="2"
-             IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-             Margin="1"
-             PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
-             Placement="Bottom">
-        <Grid x:Name="DropDown"
-              MaxHeight="{TemplateBinding MaxDropDownHeight}"
-              MinWidth="{TemplateBinding ActualWidth}"
-              SnapsToDevicePixels="True">
-          <Border x:Name="DropDownBorder"
-                  BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
-                  BorderThickness="1"
-                  Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-            <ScrollViewer x:Name="DropDownScrollViewer">
-              <Grid x:Name="grid">
-                <Canvas x:Name="canvas"
-                        HorizontalAlignment="Left"
-                        Height="0"
-                        VerticalAlignment="Top"
-                        Width="0">
-                  <Rectangle x:Name="OpaqueRect"
-                             Fill="{Binding Background, ElementName=DropDownBorder}"
-                             Height="{Binding ActualHeight, ElementName=DropDownBorder}"
-                             Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
-                </Canvas>
-                <ItemsPresenter x:Name="ItemsPresenter"
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </Grid>
-            </ScrollViewer>
-          </Border>
-        </Grid>
-      </Popup>
-      <ToggleButton x:Name="toggleButton"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    Grid.ColumnSpan="2"
-                    IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
-        <ToggleButton.Style>
-          <Style TargetType="{x:Type ToggleButton}">
-            <Setter Property="OverridesDefaultStyle"
-                    Value="True" />
-            <Setter Property="IsTabStop"
-                    Value="False" />
-            <Setter Property="Focusable"
-                    Value="False" />
-            <Setter Property="ClickMode"
-                    Value="Press" />
-            <Setter Property="Template">
-              <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                  <Border x:Name="templateRoot"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          SnapsToDevicePixels="True">
-                    <Border.Background>
-                      <LinearGradientBrush EndPoint="0,1"
-                                           StartPoint="0,0">
-                        <GradientStop Color="#FFF0F0F0"
-                                      Offset="0" />
-                        <GradientStop Color="#FFE5E5E5"
-                                      Offset="1" />
-                      </LinearGradientBrush>
-                    </Border.Background>
-                    <Border x:Name="splitBorder"
-                            BorderBrush="Transparent"
-                            BorderThickness="1"
-                            HorizontalAlignment="Right"
-                            Margin="0"
-                            SnapsToDevicePixels="True"
-                            Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                      <Path x:Name="Arrow"
-                            Data="F1M0,0L2.667,2.66665 5.3334,0 5.3334,-1.78168 2.6667,0.88501 0,-1.78168 0,0z"
-                            Fill="#FF606060"
-                            HorizontalAlignment="Center"
-                            Margin="0"
-                            VerticalAlignment="Center" />
-                    </Border>
-                  </Border>
-                  <ControlTemplate.Triggers>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsMouseOver"
-                             Value="True">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="Black" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFECF4FC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFDCECFC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF7EB4EA" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF7EB4EA" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFEBF4FC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFDCECFC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="#FF7EB4EA" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsPressed"
-                             Value="True">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="Black" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFDAECFC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFC4E0FC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF569DE5" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF569DE5" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFDAEBFC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFC4E0FC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="#FF569DE5" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsEnabled"
-                             Value="False">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="#FFBFBFBF" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="#FFF0F0F0" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FFD9D9D9" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FFBFBFBF" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                    </MultiDataTrigger>
-                  </ControlTemplate.Triggers>
-                </ControlTemplate>
-              </Setter.Value>
-            </Setter>
-          </Style>
-        </ToggleButton.Style>
-      </ToggleButton>
-      <ContentPresenter x:Name="contentPresenter"
-                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                        Content="{TemplateBinding SelectionBoxItem}"
-                        ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        IsHitTestVisible="False"
-                        Margin="{TemplateBinding Padding}"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-      <Border x:Name="Border"
-              Background="White"
-              Margin="{TemplateBinding BorderThickness}"
-              Visibility="Collapsed">
-        <TextBox x:Name="PART_EditableTextBox"
-                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                 IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                 Margin="{TemplateBinding Padding}"
-                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-          <TextBox.Style>
-            <Style TargetType="{x:Type TextBox}">
-              <Setter Property="OverridesDefaultStyle"
-                      Value="True" />
-              <Setter Property="AllowDrop"
-                      Value="True" />
-              <Setter Property="MinWidth"
-                      Value="0" />
-              <Setter Property="MinHeight"
-                      Value="0" />
-              <Setter Property="FocusVisualStyle"
-                      Value="{x:Null}" />
-              <Setter Property="Stylus.IsFlicksEnabled"
-                      Value="False" />
-              <Setter Property="Template">
-                <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type TextBox}">
-                    <ScrollViewer x:Name="PART_ContentHost"
-                                  Background="Transparent"
-                                  Focusable="False"
-                                  HorizontalScrollBarVisibility="Hidden"
-                                  VerticalScrollBarVisibility="Hidden" />
-                  </ControlTemplate>
-                </Setter.Value>
-              </Setter>
-            </Style>
-          </TextBox.Style>
-        </TextBox>
-      </Border>
-      <ContentPresenter x:Name="PART_WatermarkHost"
-                        Content="{TemplateBinding Watermark}"
-                        ContentTemplate="{TemplateBinding WatermarkTemplate}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        IsHitTestVisible="False"
-                        Margin="{TemplateBinding Padding}"
-                        Visibility="Collapsed" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems"
-               Value="False">
-        <Setter Property="Height"
-                TargetName="DropDownBorder"
-                Value="95" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping"
-                     Value="True" />
-          <!--<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping"
-                          Value="False" />-->
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll"
-                Value="False" />
-      </MultiTrigger>
-      <Trigger Property="CanContentScroll"
-               SourceName="DropDownScrollViewer"
-               Value="False">
-        <Setter Property="Canvas.Top"
-                TargetName="OpaqueRect"
-                Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}" />
-        <Setter Property="Canvas.Left"
-                TargetName="OpaqueRect"
-                Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}" />
-      </Trigger>
-      <Trigger Property="IsEditable"
-               Value="True">
-        <Setter Property="IsTabStop"
-                Value="False" />
-        <Setter Property="Padding"
-                Value="2" />
-        <Setter Property="Visibility"
-                Value="Visible"
-                TargetName="Border" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="contentPresenter" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="Text"
-                     Value="" />
-        </MultiTrigger.Conditions>
-        <MultiTrigger.Setters>
-          <Setter Property="Visibility"
-                  TargetName="PART_WatermarkHost"
-                  Value="Visible" />
-        </MultiTrigger.Setters>
-      </MultiTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- =============================================================================== -->
-  <!-- WatermarkTextBox Style                                                          -->
-  <!-- =============================================================================== -->
-
-  <Style x:Key="WatermarkComboBox"
-         TargetType="{x:Type local:WatermarkComboBox}">
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Margin="2"
-                           SnapsToDevicePixels="True"
-                           Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                           StrokeThickness="1"
-                           StrokeDashArray="1 2" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background">
-      <Setter.Value>
-        <LinearGradientBrush EndPoint="0,1"
-                             StartPoint="0,0">
-          <GradientStop Color="#FFF0F0F0"
-                        Offset="0" />
-          <GradientStop Color="#FFE5E5E5"
-                        Offset="1" />
-        </LinearGradientBrush>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="BorderBrush"
-            Value="#FFACACAC" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="Padding"
-            Value="6,3,5,3" />
-    <Setter Property="ScrollViewer.CanContentScroll"
-            Value="True" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template"
-            Value="{StaticResource WatermarkComboBoxTemplate}" />
-  </Style>
-
-  <Style TargetType="{x:Type local:WatermarkComboBox}"
-         BasedOn="{StaticResource WatermarkComboBox}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
deleted file mode 100644
index 79249aad..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
+++ /dev/null
@@ -1,324 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Security;
-using System.Windows;
-using System.Linq;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class WatermarkPasswordBox : WatermarkTextBox
-  {
-    #region Members
-
-    private int _newCaretIndex = -1;
-
-    #endregion
-
-    #region Properties
-
-    #region Password
-
-    public string Password
-    {
-      [SecuritySafeCritical]
-      get
-      {
-        string passwordString;
-        var valuePtr = Marshal.SecureStringToBSTR( this.SecurePassword );
-        try
-        {
-          passwordString = Marshal.PtrToStringUni( valuePtr );
-        }
-        finally
-        {
-          Marshal.ZeroFreeBSTR( valuePtr );
-        }
-        return passwordString;
-      }
-      set
-      {
-        if( value == null )
-        {
-          value = string.Empty;
-        }
-        this.SecurePassword = new SecureString();
-        for( int i = 0; i < value.Length; ++i )
-        {
-          this.SecurePassword.AppendChar( value[ i ] );
-        }
-
-        // Internal changes to Password property will have a _newCaretIndex > 0.
-        this.SyncTextPassword( _newCaretIndex );
-
-        this.RaiseEvent( new RoutedEventArgs( PasswordChangedEvent, this ) );
-      }
-    }
-
-    #endregion
-
-    #region PasswordChar
-
-    public static readonly DependencyProperty PasswordCharProperty = DependencyProperty.Register( "PasswordChar", typeof( char ), typeof( WatermarkPasswordBox )
-      , new UIPropertyMetadata( '\u25CF', OnPasswordCharChanged ) ); //default is black bullet
-
-    public char PasswordChar
-    {
-      get
-      {
-        return (char)GetValue( PasswordCharProperty );
-      }
-
-      set
-      {
-        SetValue( PasswordCharProperty, value );
-      }
-    }
-
-    private static void OnPasswordCharChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var watermarkPasswordBox = o as WatermarkPasswordBox;
-      if( watermarkPasswordBox != null )
-      {
-        watermarkPasswordBox.OnPasswordCharChanged( (char)e.OldValue, (char)e.NewValue );
-      }
-    }
-
-    protected virtual void OnPasswordCharChanged( char oldValue, char newValue )
-    {
-      this.SyncTextPassword( this.CaretIndex );
-    }
-
-    #endregion
-
-    #region SecurePassword
-
-    public SecureString SecurePassword
-    {
-      get;
-      private set;
-    }
-
-    #endregion SecurePassword
-
-    #endregion //Properties
-
-    #region Constructors
-
-    public WatermarkPasswordBox()
-    {
-      this.Password = string.Empty;
-      this.IsUndoEnabled = false;
-      this.UndoLimit = 0;
-
-      CommandManager.AddPreviewCanExecuteHandler( this, OnPreviewCanExecuteCommand );
-      DataObject.AddPastingHandler( this, OnPaste );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    [SecuritySafeCritical]
-    protected override void OnPreviewTextInput( TextCompositionEventArgs e )
-    {
-      this.PasswordInsert( e.Text, this.CaretIndex );
-
-      e.Handled = true; //Handle to prevent TextChanged when OnPreviewTextInput exist
-
-      base.OnPreviewTextInput( e );
-    }
-
-    [SecuritySafeCritical]
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      // Keys not detected by OnPreviewTextInput
-      switch( e.Key )
-      {
-        case Key.Space:
-          this.PasswordInsert( " ", this.CaretIndex );
-          e.Handled = true;  //Handle to prevent TextChanged when OnPreviewKeyDown exist
-          break;
-        case Key.Back:
-          // With a selection, delete from CaretIndex. Without a selection delete the character before the CaretIndex.
-          this.PasswordRemove( (this.SelectedText.Length > 0) ? this.CaretIndex : this.CaretIndex - 1 );
-          e.Handled = true;  //Handle to prevent TextChanged when OnPreviewKeyDown exists
-          break;
-        case Key.Delete:
-          this.PasswordRemove( this.CaretIndex );
-          e.Handled = true;  //Handle to prevent TextChanged when OnPreviewKeyDown exist
-          break;
-        case Key.V:
-          if( (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control )
-          {
-            if( Clipboard.ContainsText() )
-            {
-              this.PasswordInsert( Clipboard.GetText(), this.CaretIndex );
-              e.Handled = true; //Handle to prevent TextChanged when OnPreviewKeyDown exist
-            }
-          }
-          break;
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnTextChanged( TextChangedEventArgs e )
-    {
-      base.OnTextChanged( e );
-
-      if( this.Text.Length != this.Password.Length )
-      {
-        // When Clear() or Cut() methods are called, we need to update the Password property to empty.
-        if( this.Text == "" )
-        {
-          this.SetPassword( "", 0 );
-        }
-        // When AppendText() method is called, we need to reset the Text property to prevent adding text.
-        else
-        {
-          this.SyncTextPassword( this.Password.Length );
-        }
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Event
-
-    public static readonly RoutedEvent PasswordChangedEvent = EventManager.RegisterRoutedEvent( "PasswordChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler )
-      , typeof( WatermarkPasswordBox ) );
-    public event RoutedEventHandler PasswordChanged
-    {
-      add
-      {
-        AddHandler( PasswordChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PasswordChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region Event Handlers
-
-    [ SecuritySafeCritical]
-    private void OnPaste( object sender, DataObjectPastingEventArgs e )
-    {
-      //Pasting something that is not text
-      if( !e.SourceDataObject.GetDataPresent( DataFormats.UnicodeText, true ) )
-        return;
-
-      var text = e.SourceDataObject.GetData( DataFormats.UnicodeText ) as string;
-      if( text != null )
-      {
-        this.PasswordInsert( text, this.CaretIndex );
-      }
-      e.CancelCommand(); //Cancel to prevent TextChanged
-    }
-
-    private void OnPreviewCanExecuteCommand( object sender, CanExecuteRoutedEventArgs e )
-    {
-      //Will not execute these actions
-      if( e.Command == ApplicationCommands.Copy ||
-          e.Command == ApplicationCommands.Cut ||
-          e.Command == ApplicationCommands.Undo )
-      {
-        e.CanExecute = false;
-        e.Handled = true;  //Handle to prevent actions
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    [SecurityCritical]
-    private void PasswordInsert( string text, int index )
-    {
-      if( text == null )
-        return;
-      if( (index < 0) || (index > this.Password.Length) )
-        return;
-
-      //If there is a selection, remove it first
-      if( this.SelectedText.Length > 0 )
-      {
-        this.PasswordRemove( index );
-      }
-
-      var newPassword = this.Password;
-      for( int i = 0; i < text.Length; ++i )
-      {
-        // MaxLength == 0 is no limit
-        if( (this.MaxLength == 0) || (newPassword.Length < this.MaxLength) )
-        {
-          newPassword = newPassword.Insert( index++, text[ i ].ToString() );
-        }
-      }
-      this.SetPassword( newPassword, index );
-    }
-
-    [SecurityCritical]
-    private void PasswordRemove( int index )
-    {
-      if( (index < 0) || (index >= this.Password.Length) )
-        return;
-
-      if( this.SelectedText.Length > 0 )
-      {
-        var newPassword = this.Password;
-        for( int i = 0; i < this.SelectedText.Length; ++i )
-        {
-          newPassword = newPassword.Remove( index, 1 );          
-        }
-        this.SetPassword( newPassword, index );
-      }
-      else
-      {
-        var newPassword = this.Password.Remove( index, 1 );
-        this.SetPassword( newPassword, index );
-      }
-    }
-
-    private void SetPassword( string password, int caretIndex )
-    {
-      _newCaretIndex = caretIndex;
-      this.Password = password;
-      _newCaretIndex = -1;
-    }
-
-    private void SyncTextPassword( int nextCarretIndex )
-    {
-      var sb = new StringBuilder();
-      this.Text = sb.Append( Enumerable.Repeat(this.PasswordChar, this.Password.Length).ToArray() ).ToString();
-      //set CaretIndex after Text is changed
-      this.CaretIndex = Math.Max( nextCarretIndex, 0 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
deleted file mode 100644
index 58483022..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit
-{
-#pragma warning disable 0618
-
-  public class WatermarkTextBox : AutoSelectTextBox
-  {
-    #region Properties
-
-    #region KeepWatermarkOnGotFocus
-
-    public static readonly DependencyProperty KeepWatermarkOnGotFocusProperty = DependencyProperty.Register( "KeepWatermarkOnGotFocus", typeof( bool ), typeof( WatermarkTextBox ), new UIPropertyMetadata( false ) );
-    public bool KeepWatermarkOnGotFocus
-    {
-      get
-      {
-        return ( bool )GetValue( KeepWatermarkOnGotFocusProperty );
-      }
-      set
-      {
-        SetValue( KeepWatermarkOnGotFocusProperty, value );
-      }
-    }
-
-    #endregion //KeepWatermarkOnGotFocus
-
-    #region Watermark
-
-    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( WatermarkTextBox ), new UIPropertyMetadata( null ) );
-    public object Watermark
-    {
-      get
-      {
-        return ( object )GetValue( WatermarkProperty );
-      }
-      set
-      {
-        SetValue( WatermarkProperty, value );
-      }
-    }
-
-    #endregion //Watermark
-
-    #region WatermarkTemplate
-
-    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( WatermarkTextBox ), new UIPropertyMetadata( null ) );
-    public DataTemplate WatermarkTemplate
-    {
-      get
-      {
-        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
-      }
-      set
-      {
-        SetValue( WatermarkTemplateProperty, value );
-      }
-    }
-
-    #endregion //WatermarkTemplate
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static WatermarkTextBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( WatermarkTextBox ), new FrameworkPropertyMetadata( typeof( WatermarkTextBox ) ) );
-    }
-
-    public WatermarkTextBox()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-
-
-
-    #endregion
-  }
-
-#pragma warning restore 0618
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 700d3c07..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,167 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                    Focusable="False" />
-  </DataTemplate>
-
-  <LinearGradientBrush x:Key="TextBox_MouseOver"
-                       EndPoint="0,1"
-                       StartPoint="0,0">
-    <GradientStop Color="#5794BF"
-                  Offset="0.05" />
-    <GradientStop Color="#B7D5EA"
-                  Offset="0.07" />
-    <GradientStop Color="#C7E2F1"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="TextBox_Focused"
-                       EndPoint="0,1"
-                       StartPoint="0,0">
-    <GradientStop Color="#3D7BAD"
-                  Offset="0.05" />
-    <GradientStop Color="#A4C9E3"
-                  Offset="0.07" />
-    <GradientStop Color="#B7D9ED"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-
-  <!-- =============================================================================== -->
-  <!-- WatermarkTextBox                                                                -->
-  <!-- =============================================================================== -->
-
-  <Style x:Key="WatermarkTextBox"
-         TargetType="{x:Type local:WatermarkTextBox}">
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Padding"
-            Value="3" />
-    <Setter Property="AllowDrop"
-            Value="true" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Stylus.IsFlicksEnabled"
-            Value="False" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
-          <Grid>
-
-            <Border x:Name="Border"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    CornerRadius="0"
-                    Background="{TemplateBinding Background}">
-              <Grid>
-                <ScrollViewer x:Name="PART_ContentHost"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                </ScrollViewer>
-                <ContentPresenter x:Name="PART_WatermarkHost"
-                                  Content="{TemplateBinding Watermark}"
-                                  ContentTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultWatermarkTemplate}}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  IsHitTestVisible="False"
-                                  Margin="{TemplateBinding Padding}"
-                                  Visibility="Collapsed" />
-              </Grid>
-            </Border>
-            <Border x:Name="MouseOverVisual"
-                    Opacity="0"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{StaticResource TextBox_MouseOver}"
-                    CornerRadius="1" />
-            <Border x:Name="FocusVisual"
-                    Opacity="0"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{StaticResource TextBox_Focused}"
-                    CornerRadius="1" />
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="KeepWatermarkOnGotFocus"
-                           Value="False" />
-                <Condition Property="IsFocused"
-                           Value="False" />
-                <Condition Property="Text"
-                           Value="" />
-              </MultiTrigger.Conditions>
-              <MultiTrigger.Setters>
-                <Setter Property="Visibility"
-                        TargetName="PART_WatermarkHost"
-                        Value="Visible" />
-              </MultiTrigger.Setters>
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="KeepWatermarkOnGotFocus"
-                           Value="True" />
-                <Condition Property="Text"
-                           Value="" />
-              </MultiTrigger.Conditions>
-              <MultiTrigger.Setters>
-                <Setter Property="Visibility"
-                        TargetName="PART_WatermarkHost"
-                        Value="Visible" />
-              </MultiTrigger.Setters>
-            </MultiTrigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="Border"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocusWithin"
-                     Value="True">
-              <Setter TargetName="Border"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:WatermarkTextBox}"
-         BasedOn="{StaticResource WatermarkTextBox}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
deleted file mode 100644
index 2e0c4f29..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-  <LinearGradientBrush x:Key="TextBoxBorder"
-                       EndPoint="0,20"
-                       MappingMode="Absolute"
-                       StartPoint="0,0">
-    <GradientStop Color="#ABADB3"
-                  Offset="0.05" />
-    <GradientStop Color="#E2E3EA"
-                  Offset="0.07" />
-    <GradientStop Color="#E3E9EF"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="TextBox_MouseOver"
-                       EndPoint="0,1"
-                       StartPoint="0,0">
-    <GradientStop Color="#5794BF"
-                  Offset="0.05" />
-    <GradientStop Color="#B7D5EA"
-                  Offset="0.07" />
-    <GradientStop Color="#C7E2F1"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="TextBox_Focused"
-                       EndPoint="0,1"
-                       StartPoint="0,0">
-    <GradientStop Color="#3D7BAD"
-                  Offset="0.05" />
-    <GradientStop Color="#A4C9E3"
-                  Offset="0.07" />
-    <GradientStop Color="#B7D9ED"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="TextBox_DisabledBorder"
-                   Color="#ADB2B5" />
-  <SolidColorBrush x:Key="TextBox_DisabledBackground"
-                   Color="#F4F4F4" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="Gray"
-                    Focusable="False" />
-  </DataTemplate>
-
-  <Style x:Key="WatermarkTextBox"
-         TargetType="{x:Type local:WatermarkTextBox}">
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{StaticResource TextBoxBorder}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Padding"
-            Value="3" />
-    <Setter Property="AllowDrop"
-            Value="true" />
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Stylus.IsFlicksEnabled"
-            Value="False" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
-          <Grid>
-
-            <Border x:Name="Border"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    CornerRadius="1"
-                    Background="{TemplateBinding Background}">
-              <Grid>
-                <ScrollViewer x:Name="PART_ContentHost"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" >
-                </ScrollViewer>
-                <ContentPresenter x:Name="PART_WatermarkHost"
-                                  Content="{TemplateBinding Watermark}"
-                                  ContentTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultWatermarkTemplate}}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  IsHitTestVisible="False"
-                                  Margin="{TemplateBinding Padding}"
-                                  Visibility="Collapsed" />
-              </Grid>
-            </Border>
-            <Border x:Name="MouseOverVisual"
-                    Opacity="0"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{StaticResource TextBox_MouseOver}"
-                    CornerRadius="1" />
-            <Border x:Name="FocusVisual"
-                    Opacity="0"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{StaticResource TextBox_Focused}"
-                    CornerRadius="1" />
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="KeepWatermarkOnGotFocus"
-                           Value="False" />
-                <Condition Property="IsFocused"
-                           Value="False" />
-                <Condition Property="Text"
-                           Value="" />
-              </MultiTrigger.Conditions>
-              <MultiTrigger.Setters>
-                <Setter Property="Visibility"
-                        TargetName="PART_WatermarkHost"
-                        Value="Visible" />
-              </MultiTrigger.Setters>
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="KeepWatermarkOnGotFocus"
-                           Value="True" />
-                <Condition Property="Text"
-                           Value="" />
-              </MultiTrigger.Conditions>
-              <MultiTrigger.Setters>
-                <Setter Property="Visibility"
-                        TargetName="PART_WatermarkHost"
-                        Value="Visible" />
-              </MultiTrigger.Setters>
-            </MultiTrigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="MouseOverVisual"
-                      Property="Opacity"
-                      Value="1" />
-            </Trigger>
-            <Trigger Property="IsFocused"
-                     Value="True">
-              <Setter TargetName="FocusVisual"
-                      Property="Opacity"
-                      Value="1" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="false">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:WatermarkTextBox}"
-         BasedOn="{StaticResource WatermarkTextBox}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
deleted file mode 100644
index 6daa0ed2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
+++ /dev/null
@@ -1,691 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Specialized;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Interop;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class Wizard : ItemsControl
-  {
-    #region Properties
-
-    public static readonly DependencyProperty BackButtonContentProperty = DependencyProperty.Register( "BackButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "< Back" ) );
-    public object BackButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( BackButtonContentProperty );
-      }
-      set
-      {
-        SetValue( BackButtonContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register( "BackButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
-    public Visibility BackButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( BackButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( BackButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register( "CanCancel", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool CanCancel
-    {
-      get
-      {
-        return ( bool )GetValue( CanCancelProperty );
-      }
-      set
-      {
-        SetValue( CanCancelProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CancelButtonClosesWindowProperty = DependencyProperty.Register( "CancelButtonClosesWindow", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool CancelButtonClosesWindow
-    {
-      get
-      {
-        return ( bool )GetValue( CancelButtonClosesWindowProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonClosesWindowProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Cancel" ) );
-    public object CancelButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( CancelButtonContentProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register( "CancelButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
-    public Visibility CancelButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( CancelButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register( "CanFinish", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( false ) );
-    public bool CanFinish
-    {
-      get
-      {
-        return ( bool )GetValue( CanFinishProperty );
-      }
-      set
-      {
-        SetValue( CanFinishProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register( "CanHelp", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool CanHelp
-    {
-      get
-      {
-        return ( bool )GetValue( CanHelpProperty );
-      }
-      set
-      {
-        SetValue( CanHelpProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register( "CanSelectNextPage", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool CanSelectNextPage
-    {
-      get
-      {
-        return ( bool )GetValue( CanSelectNextPageProperty );
-      }
-      set
-      {
-        SetValue( CanSelectNextPageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register( "CanSelectPreviousPage", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool CanSelectPreviousPage
-    {
-      get
-      {
-        return ( bool )GetValue( CanSelectPreviousPageProperty );
-      }
-      set
-      {
-        SetValue( CanSelectPreviousPageProperty, value );
-      }
-    }
-
-    #region CurrentPage
-
-    public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register( "CurrentPage", typeof( WizardPage ), typeof( Wizard ), new UIPropertyMetadata( null, OnCurrentPageChanged ) );
-    public WizardPage CurrentPage
-    {
-      get
-      {
-        return ( WizardPage )GetValue( CurrentPageProperty );
-      }
-      set
-      {
-        SetValue( CurrentPageProperty, value );
-      }
-    }
-
-    private static void OnCurrentPageChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Wizard wizard = o as Wizard;
-      if( wizard != null )
-        wizard.OnCurrentPageChanged( ( WizardPage )e.OldValue, ( WizardPage )e.NewValue );
-    }
-
-    protected virtual void OnCurrentPageChanged( WizardPage oldValue, WizardPage newValue )
-    {
-      RaiseRoutedEvent( Wizard.PageChangedEvent );
-    }
-
-    #endregion //CurrentPage
-
-    public static readonly DependencyProperty ExteriorPanelMinWidthProperty = DependencyProperty.Register( "ExteriorPanelMinWidth", typeof( double ), typeof( Wizard ), new UIPropertyMetadata( 165.0 ) );
-    public double ExteriorPanelMinWidth
-    {
-      get
-      {
-        return ( double )GetValue( ExteriorPanelMinWidthProperty );
-      }
-      set
-      {
-        SetValue( ExteriorPanelMinWidthProperty, value );
-      }
-    }
-
-
-    public static readonly DependencyProperty FinishButtonClosesWindowProperty = DependencyProperty.Register( "FinishButtonClosesWindow", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool FinishButtonClosesWindow
-    {
-      get
-      {
-        return ( bool )GetValue( FinishButtonClosesWindowProperty );
-      }
-      set
-      {
-        SetValue( FinishButtonClosesWindowProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty FinishButtonContentProperty = DependencyProperty.Register( "FinishButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Finish" ) );
-    public object FinishButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( FinishButtonContentProperty );
-      }
-      set
-      {
-        SetValue( FinishButtonContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Collapsed ) );
-    public Visibility FinishButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( FinishButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( FinishButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HelpButtonContentProperty = DependencyProperty.Register( "HelpButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Help" ) );
-    public object HelpButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( HelpButtonContentProperty );
-      }
-      set
-      {
-        SetValue( HelpButtonContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register( "HelpButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
-    public Visibility HelpButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( HelpButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( HelpButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NextButtonContentProperty = DependencyProperty.Register( "NextButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Next >" ) );
-    public object NextButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( NextButtonContentProperty );
-      }
-      set
-      {
-        SetValue( NextButtonContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register( "NextButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
-    public Visibility NextButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( NextButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( NextButtonVisibilityProperty, value );
-      }
-    }
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static Wizard()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( Wizard ), new FrameworkPropertyMetadata( typeof( Wizard ) ) );
-    }
-
-    public Wizard()
-    {
-      CommandBindings.Add( new CommandBinding( WizardCommands.Cancel, ExecuteCancelWizard, CanExecuteCancelWizard ) );
-      CommandBindings.Add( new CommandBinding( WizardCommands.Finish, ExecuteFinishWizard, CanExecuteFinishWizard ) );
-      CommandBindings.Add( new CommandBinding( WizardCommands.Help, ExecuteRequestHelp, CanExecuteRequestHelp ) );
-      CommandBindings.Add( new CommandBinding( WizardCommands.NextPage, ExecuteSelectNextPage, CanExecuteSelectNextPage ) );
-      CommandBindings.Add( new CommandBinding( WizardCommands.PreviousPage, ExecuteSelectPreviousPage, CanExecuteSelectPreviousPage ) );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override DependencyObject GetContainerForItemOverride()
-    {
-      return new WizardPage();
-    }
-
-    protected override bool IsItemItsOwnContainerOverride( object item )
-    {
-      return ( item is WizardPage );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-
-      if( Items.Count > 0 && CurrentPage == null )
-        CurrentPage = Items[ 0 ] as WizardPage;
-    }
-
-    protected override void OnItemsChanged( NotifyCollectionChangedEventArgs e )
-    {
-      base.OnItemsChanged( e );
-
-      foreach( object o in this.Items )
-      {
-        if( !( o is WizardPage ) )
-          throw new NotSupportedException( "Wizard should only contain WizardPages." );
-      }
-
-      if( Items.Count > 0 && CurrentPage == null )
-        CurrentPage = Items[ 0 ] as WizardPage;
-    }
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      if( ( e.Property.Name == "CanSelectNextPage" ) || ( e.Property.Name == "CanHelp" ) || ( e.Property.Name == "CanFinish" )
-        || ( e.Property.Name == "CanCancel" ) || ( e.Property.Name == "CanSelectPreviousPage" ) )
-      {
-        CommandManager.InvalidateRequerySuggested();
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Commands
-
-    private void ExecuteCancelWizard( object sender, ExecutedRoutedEventArgs e )
-    {
-      RaiseRoutedEvent( Wizard.CancelEvent );
-
-      if( CancelButtonClosesWindow )
-        CloseParentWindow( false );
-    }
-
-    private void CanExecuteCancelWizard( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( CurrentPage != null )
-      {
-        if( CurrentPage.CanCancel.HasValue )
-          e.CanExecute = CurrentPage.CanCancel.Value;
-        else
-          e.CanExecute = CanCancel;
-      }
-    }
-
-    private void ExecuteFinishWizard( object sender, ExecutedRoutedEventArgs e )
-    {
-      var eventArgs = new CancelRoutedEventArgs( Wizard.FinishEvent );
-      this.RaiseEvent( eventArgs );
-      if( eventArgs.Cancel )
-        return;
-
-      if( FinishButtonClosesWindow )
-        CloseParentWindow( true );
-    }
-
-    private void CanExecuteFinishWizard( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( CurrentPage != null )
-      {
-        if( CurrentPage.CanFinish.HasValue )
-          e.CanExecute = CurrentPage.CanFinish.Value;
-        else
-          e.CanExecute = CanFinish;
-      }
-    }
-
-    private void ExecuteRequestHelp( object sender, ExecutedRoutedEventArgs e )
-    {
-      RaiseRoutedEvent( Wizard.HelpEvent );
-    }
-
-    private void CanExecuteRequestHelp( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( CurrentPage != null )
-      {
-        if( CurrentPage.CanHelp.HasValue )
-          e.CanExecute = CurrentPage.CanHelp.Value;
-        else
-          e.CanExecute = CanHelp;
-      }
-    }
-
-    private void ExecuteSelectNextPage( object sender, ExecutedRoutedEventArgs e )
-    {
-      WizardPage nextPage = null;
-
-      if( CurrentPage != null )
-      {
-        var eventArgs = new CancelRoutedEventArgs( NextEvent );
-        this.RaiseEvent( eventArgs );
-        if( eventArgs.Cancel )
-          return;
-
-        //check next page
-        if( CurrentPage.NextPage != null )
-          nextPage = CurrentPage.NextPage;
-        else
-        {
-          //no next page defined use index
-          var currentIndex = Items.IndexOf( CurrentPage );
-          var nextPageIndex = currentIndex + 1;
-          if( nextPageIndex < Items.Count )
-            nextPage = Items[ nextPageIndex ] as WizardPage;
-        }
-      }
-
-      CurrentPage = nextPage;
-    }
-
-    private void CanExecuteSelectNextPage( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( CurrentPage != null )
-      {
-        if( CurrentPage.CanSelectNextPage.HasValue ) //check to see if page has overriden default behavior
-        {
-          if( CurrentPage.CanSelectNextPage.Value )
-            e.CanExecute = NextPageExists();
-        }
-        else if( CanSelectNextPage )
-          e.CanExecute = NextPageExists();
-      }
-    }
-
-    private void ExecuteSelectPreviousPage( object sender, ExecutedRoutedEventArgs e )
-    {
-      WizardPage previousPage = null;
-
-      if( CurrentPage != null )
-      {
-        var eventArgs = new CancelRoutedEventArgs( PreviousEvent );
-        this.RaiseEvent( eventArgs );
-        if( eventArgs.Cancel )
-          return;
-
-        //check previous page
-        if( CurrentPage.PreviousPage != null )
-          previousPage = CurrentPage.PreviousPage;
-        else
-        {
-          //no previous page defined so use index
-          var currentIndex = Items.IndexOf( CurrentPage );
-          var previousPageIndex = currentIndex - 1;
-          if( previousPageIndex >= 0 && previousPageIndex < Items.Count )
-            previousPage = Items[ previousPageIndex ] as WizardPage;
-        }
-      }
-
-      CurrentPage = previousPage;
-    }
-
-    private void CanExecuteSelectPreviousPage( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( CurrentPage != null )
-      {
-        if( CurrentPage.CanSelectPreviousPage.HasValue ) //check to see if page has overriden default behavior
-        {
-          if( CurrentPage.CanSelectPreviousPage.Value )
-            e.CanExecute = PreviousPageExists();
-        }
-        else if( CanSelectPreviousPage )
-          e.CanExecute = PreviousPageExists();
-      }
-    }
-
-    #endregion //Commands
-
-    #region Events
-
-    #region Cancel Event
-
-    public static readonly RoutedEvent CancelEvent = EventManager.RegisterRoutedEvent( "Cancel", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
-    public event RoutedEventHandler Cancel
-    {
-      add
-      {
-        AddHandler( CancelEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( CancelEvent, value );
-      }
-    }
-
-    #endregion //Cancel Event
-
-    #region PageChanged Event
-
-    public static readonly RoutedEvent PageChangedEvent = EventManager.RegisterRoutedEvent( "PageChanged", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
-    public event RoutedEventHandler PageChanged
-    {
-      add
-      {
-        AddHandler( PageChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PageChangedEvent, value );
-      }
-    }
-
-    #endregion //PageChanged Event
-
-    #region Finish Event
-
-    public static readonly RoutedEvent FinishEvent = EventManager.RegisterRoutedEvent( "Finish", RoutingStrategy.Bubble, typeof( CancelRoutedEventHandler ), typeof( Wizard ) );
-    public event CancelRoutedEventHandler Finish
-    {
-      add
-      {
-        AddHandler( FinishEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( FinishEvent, value );
-      }
-    }
-
-    #endregion //Finish Event
-
-    #region Help Event
-
-    public static readonly RoutedEvent HelpEvent = EventManager.RegisterRoutedEvent( "Help", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
-    public event RoutedEventHandler Help
-    {
-      add
-      {
-        AddHandler( HelpEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( HelpEvent, value );
-      }
-    }
-
-    #endregion //Help Event
-
-    #region Next Event
-
-    public delegate void NextRoutedEventHandler( object sender, CancelRoutedEventArgs e );
-
-    /// <summary>
-    /// Identifies the Next routed event.
-    /// </summary>
-    public static readonly RoutedEvent NextEvent = EventManager.RegisterRoutedEvent( "Next", RoutingStrategy.Bubble, typeof( NextRoutedEventHandler ), typeof( Wizard ) );
-    /// <summary>
-    /// Raised when WizardCommands.NextPage command is executed.
-    /// This cancellable event can prevent the command execution from continuing.
-    /// </summary>
-    public event NextRoutedEventHandler Next
-    {
-      add
-      {
-        AddHandler( NextEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( NextEvent, value );
-      }
-    }
-
-    #endregion //Next Event
-
-    #region Previous Event
-
-    public delegate void PreviousRoutedEventHandler( object sender, CancelRoutedEventArgs e );
-
-    /// <summary>
-    /// Identifies the Previous routed event.
-    /// </summary>
-    public static readonly RoutedEvent PreviousEvent = EventManager.RegisterRoutedEvent( "Previous", RoutingStrategy.Bubble, typeof( PreviousRoutedEventHandler ), typeof( Wizard ) );
-    /// <summary>
-    /// Raised when WizardCommands.PreviousPage command is executed.
-    /// This cancellable event can prevent the command execution from continuing.
-    /// </summary>
-    public event PreviousRoutedEventHandler Previous
-    {
-      add
-      {
-        AddHandler( PreviousEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PreviousEvent, value );
-      }
-    }
-
-    #endregion //Previous Event
-
-    #endregion //Events
-
-    #region Methods
-
-    private void CloseParentWindow( bool dialogResult )
-    {
-      Window window = Window.GetWindow( this );
-      if( window != null )
-      {
-        //we can only set the DialogResult if the window was opened as modal with the ShowDialog() method. Otherwise an exception would occur
-        if( ComponentDispatcher.IsThreadModal )
-          window.DialogResult = dialogResult;
-
-        window.Close();
-      }
-    }
-
-    private bool NextPageExists()
-    {
-      bool exists = false;
-
-      if( CurrentPage.NextPage != null ) //check to see if a next page has been specified
-        exists = true;
-      else
-      {
-        //lets use an index to find the next page
-        var currentIndex = Items.IndexOf( CurrentPage );
-        var nextPageIndex = currentIndex + 1;
-        if( nextPageIndex < Items.Count )
-          exists = true;
-      }
-
-      return exists;
-    }
-
-    private bool PreviousPageExists()
-    {
-      bool exists = false;
-
-      if( CurrentPage.PreviousPage != null ) //check to see if a previous page has been specified
-        exists = true;
-      else
-      {
-        //lets use an index to find the next page
-        var currentIndex = Items.IndexOf( CurrentPage );
-        var previousPageIndex = currentIndex - 1;
-        if( previousPageIndex >= 0 && previousPageIndex < Items.Count )
-          exists = true;
-      }
-
-      return exists;
-    }
-
-    private void RaiseRoutedEvent( RoutedEvent routedEvent )
-    {
-      RoutedEventArgs newEventArgs = new RoutedEventArgs( routedEvent, this );
-      base.RaiseEvent( newEventArgs );
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
deleted file mode 100644
index 06931d6f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public static class WizardCommands
-  {
-
-    private static RoutedCommand _cancelCommand = new RoutedCommand();
-    public static RoutedCommand Cancel
-    {
-      get
-      {
-        return _cancelCommand;
-      }
-    }
-
-    private static RoutedCommand _finishCommand = new RoutedCommand();
-    public static RoutedCommand Finish
-    {
-      get
-      {
-        return _finishCommand;
-      }
-    }
-
-    private static RoutedCommand _helpCommand = new RoutedCommand();
-    public static RoutedCommand Help
-    {
-      get
-      {
-        return _helpCommand;
-      }
-    }
-
-    private static RoutedCommand _nextPageCommand = new RoutedCommand();
-    public static RoutedCommand NextPage
-    {
-      get
-      {
-        return _nextPageCommand;
-      }
-    }
-
-    private static RoutedCommand _previousPageCommand = new RoutedCommand();
-    public static RoutedCommand PreviousPage
-    {
-      get
-      {
-        return _previousPageCommand;
-      }
-    }
-
-    private static RoutedCommand _selectPageCommand = new RoutedCommand();
-    public static RoutedCommand SelectPage
-    {
-      get
-      {
-        return _selectPageCommand;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
deleted file mode 100644
index 635e683d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
+++ /dev/null
@@ -1,362 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class WizardPage : ContentControl
-  {
-    #region Properties
-
-    public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register( "BackButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
-    public WizardPageButtonVisibility BackButtonVisibility
-    {
-      get
-      {
-        return ( WizardPageButtonVisibility )GetValue( BackButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( BackButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register( "CanCancel", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public bool? CanCancel
-    {
-      get
-      {
-        return ( bool? )GetValue( CanCancelProperty );
-      }
-      set
-      {
-        SetValue( CanCancelProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register( "CancelButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
-    public WizardPageButtonVisibility CancelButtonVisibility
-    {
-      get
-      {
-        return ( WizardPageButtonVisibility )GetValue( CancelButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register( "CanFinish", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public bool? CanFinish
-    {
-      get
-      {
-        return ( bool? )GetValue( CanFinishProperty );
-      }
-      set
-      {
-        SetValue( CanFinishProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register( "CanHelp", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public bool? CanHelp
-    {
-      get
-      {
-        return ( bool? )GetValue( CanHelpProperty );
-      }
-      set
-      {
-        SetValue( CanHelpProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register( "CanSelectNextPage", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public bool? CanSelectNextPage
-    {
-      get
-      {
-        return ( bool? )GetValue( CanSelectNextPageProperty );
-      }
-      set
-      {
-        SetValue( CanSelectNextPageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register( "CanSelectPreviousPage", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public bool? CanSelectPreviousPage
-    {
-      get
-      {
-        return ( bool? )GetValue( CanSelectPreviousPageProperty );
-      }
-      set
-      {
-        SetValue( CanSelectPreviousPageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register( "Description", typeof( string ), typeof( WizardPage ) );
-    public string Description
-    {
-      get
-      {
-        return ( string )base.GetValue( DescriptionProperty );
-      }
-      set
-      {
-        base.SetValue( DescriptionProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ExteriorPanelBackgroundProperty = DependencyProperty.Register( "ExteriorPanelBackground", typeof( Brush ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public Brush ExteriorPanelBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( ExteriorPanelBackgroundProperty );
-      }
-      set
-      {
-        SetValue( ExteriorPanelBackgroundProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ExteriorPanelContentProperty = DependencyProperty.Register( "ExteriorPanelContent", typeof( object ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public object ExteriorPanelContent
-    {
-      get
-      {
-        return ( object )GetValue( ExteriorPanelContentProperty );
-      }
-      set
-      {
-        SetValue( ExteriorPanelContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
-    public WizardPageButtonVisibility FinishButtonVisibility
-    {
-      get
-      {
-        return ( WizardPageButtonVisibility )GetValue( FinishButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( FinishButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HeaderBackgroundProperty = DependencyProperty.Register( "HeaderBackground", typeof( Brush ), typeof( WizardPage ), new UIPropertyMetadata( Brushes.White ) );
-    public Brush HeaderBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( HeaderBackgroundProperty );
-      }
-      set
-      {
-        SetValue( HeaderBackgroundProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HeaderImageProperty = DependencyProperty.Register( "HeaderImage", typeof( ImageSource ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public ImageSource HeaderImage
-    {
-      get
-      {
-        return ( ImageSource )GetValue( HeaderImageProperty );
-      }
-      set
-      {
-        SetValue( HeaderImageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register( "HelpButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
-    public WizardPageButtonVisibility HelpButtonVisibility
-    {
-      get
-      {
-        return ( WizardPageButtonVisibility )GetValue( HelpButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( HelpButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register( "NextButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
-    public WizardPageButtonVisibility NextButtonVisibility
-    {
-      get
-      {
-        return ( WizardPageButtonVisibility )GetValue( NextButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( NextButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NextPageProperty = DependencyProperty.Register( "NextPage", typeof( WizardPage ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public WizardPage NextPage
-    {
-      get
-      {
-        return ( WizardPage )GetValue( NextPageProperty );
-      }
-      set
-      {
-        SetValue( NextPageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty PageTypeProperty = DependencyProperty.Register( "PageType", typeof( WizardPageType ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageType.Exterior ) );
-    public WizardPageType PageType
-    {
-      get
-      {
-        return ( WizardPageType )GetValue( PageTypeProperty );
-      }
-      set
-      {
-        SetValue( PageTypeProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty PreviousPageProperty = DependencyProperty.Register( "PreviousPage", typeof( WizardPage ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public WizardPage PreviousPage
-    {
-      get
-      {
-        return ( WizardPage )GetValue( PreviousPageProperty );
-      }
-      set
-      {
-        SetValue( PreviousPageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( WizardPage ) );
-    public string Title
-    {
-      get
-      {
-        return ( string )base.GetValue( TitleProperty );
-      }
-      set
-      {
-        base.SetValue( TitleProperty, value );
-      }
-    }
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static WizardPage()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( WizardPage ), new FrameworkPropertyMetadata( typeof( WizardPage ) ) );
-    }
-
-    public WizardPage()
-    {
-      this.Loaded += new RoutedEventHandler( WizardPage_Loaded );
-      this.Unloaded += new RoutedEventHandler( WizardPage_Unloaded );
-    }
-
-    void WizardPage_Unloaded( object sender, RoutedEventArgs e )
-    {
-      base.RaiseEvent( new RoutedEventArgs( WizardPage.LeaveEvent, this ) );
-    }
-
-    void WizardPage_Loaded( object sender, RoutedEventArgs e )
-    {
-      if( this.IsVisible )
-      {
-        base.RaiseEvent( new RoutedEventArgs( WizardPage.EnterEvent, this ) );
-      }
-    }
-
-    #endregion //Constructors
-
-    #region Overrides
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      if( ( e.Property.Name == "CanSelectNextPage" ) || ( e.Property.Name == "CanHelp" ) || ( e.Property.Name == "CanFinish" )
-        || ( e.Property.Name == "CanCancel" ) || ( e.Property.Name == "CanSelectPreviousPage" ) )
-      {
-        CommandManager.InvalidateRequerySuggested();
-      }
-    }
-
-
-
-
-    #endregion
-
-    #region Events
-
-    #region Enter Event
-
-    public static readonly RoutedEvent EnterEvent = EventManager.RegisterRoutedEvent( "Enter", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( WizardPage ) );
-    public event RoutedEventHandler Enter
-    {
-      add
-      {
-        AddHandler( EnterEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( EnterEvent, value );
-      }
-    }
-
-    #endregion //Enter Event
-
-    #region Leave Event
-
-    public static readonly RoutedEvent LeaveEvent = EventManager.RegisterRoutedEvent( "Leave", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( WizardPage ) );
-    public event RoutedEventHandler Leave
-    {
-      add
-      {
-        AddHandler( LeaveEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( LeaveEvent, value );
-      }
-    }
-
-    #endregion //Leave Event
-
-    #endregion  //Events
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
deleted file mode 100644
index 6351252f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum WizardPageButtonVisibility
-  {
-    Inherit,
-    Collapsed,
-    Hidden,
-    Visible
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
deleted file mode 100644
index 0a9d7668..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum WizardPageType
-  {
-    Blank,
-    Exterior,
-    Interior
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index dbfd0a11..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,303 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
-
-  <Style TargetType="{x:Type local:Wizard}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="ItemsPanel">
-      <Setter.Value>
-        <ItemsPanelTemplate>
-          <Grid />
-        </ItemsPanelTemplate>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:Wizard}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Padding="{TemplateBinding Padding}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-
-              <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
-
-              <Border Grid.Row="1"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="0,1,0,0"
-                      Padding="7">
-                <StackPanel>
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="Auto" />
-                      <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Button Name="HelpButton"
-                            Grid.Column="0"
-                            MinWidth="75"
-                            Command="local:WizardCommands.Help"
-                            Content="{TemplateBinding HelpButtonContent}">
-                      <Button.Visibility>
-                        <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                          <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                   Path="HelpButtonVisibility" />
-                          <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                   Path="CurrentPage.HelpButtonVisibility" />
-                        </MultiBinding>
-                      </Button.Visibility>
-                    </Button>
-                    <StackPanel Grid.Column="1"
-                                Orientation="Horizontal"
-                                HorizontalAlignment="Right">                    
-                      <Button Name="BackButton"
-                              MinWidth="75"
-                              Command="local:WizardCommands.PreviousPage"
-                              Content="{TemplateBinding BackButtonContent}">
-                        <Button.Visibility>
-                          <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                     Path="BackButtonVisibility" />
-                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                     Path="CurrentPage.BackButtonVisibility" />
-                          </MultiBinding>
-                        </Button.Visibility>
-                      </Button>
-                      <Grid MinWidth="75"
-                            Margin="2,0,0,0">
-                        <Button Name="NextButton"
-                                Command="local:WizardCommands.NextPage"
-                                Content="{TemplateBinding NextButtonContent}">
-                          <Button.Visibility>
-                            <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                              <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                       Path="NextButtonVisibility" />
-                              <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                       Path="CurrentPage.NextButtonVisibility" />
-                            </MultiBinding>
-                          </Button.Visibility>
-                        </Button>
-                        <Button Name="FinishButton"
-                                Command="local:WizardCommands.Finish"
-                                Content="{TemplateBinding FinishButtonContent}">
-                          <Button.Visibility>
-                            <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                              <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                       Path="FinishButtonVisibility" />
-                              <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                       Path="CurrentPage.FinishButtonVisibility" />
-                            </MultiBinding>
-                          </Button.Visibility>
-                        </Button>
-                      </Grid>
-                      <Button Name="CancelButton"
-                              Margin="7,0,0,0"
-                              MinWidth="75"
-                              Command="local:WizardCommands.Cancel"
-                              Content="{TemplateBinding CancelButtonContent}">
-                        <Button.Visibility>
-                          <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                      Path="CancelButtonVisibility" />
-                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                      Path="CurrentPage.CancelButtonVisibility" />
-                          </MultiBinding>
-                        </Button.Visibility>
-                      </Button>
-                    </StackPanel>
-                  </Grid>
-                </StackPanel>
-              </Border>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="True"
-                     SourceName="FinishButton">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="FinishButton" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <ControlTemplate x:Key="BlankWizardPageTemplate"
-                   TargetType="{x:Type local:WizardPage}">
-    <Border SnapsToDevicePixels="true"
-            Background="{TemplateBinding Background}"
-            BorderThickness="{TemplateBinding BorderThickness}"
-            BorderBrush="{TemplateBinding BorderBrush}">
-      <Grid Background="{TemplateBinding Background}">
-        <ContentPresenter Margin="14"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-      </Grid>
-    </Border>
-  </ControlTemplate>
-
-  <ControlTemplate x:Key="ExteriorWizardPageTemplate"
-                   TargetType="{x:Type local:WizardPage}">
-    <Grid Background="{TemplateBinding Background}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-      <Border SnapsToDevicePixels="true"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              BorderBrush="{TemplateBinding BorderBrush}">
-        <Grid Grid.Column="0"
-              Background="{TemplateBinding ExteriorPanelBackground}"
-              MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
-          <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
-        </Grid>
-      </Border>
-      <Grid Column="1"
-            Margin="14">
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <TextBlock Grid.Row="0"
-                   TextWrapping="Wrap"
-                   Margin="0,0,0,14"
-                   FontSize="16"
-                   FontWeight="Bold"
-                   Text="{TemplateBinding Title}">
-        </TextBlock>
-        <TextBlock Grid.Row="1"
-                   TextWrapping="Wrap"
-                   Margin="0,0,0,14"
-                   Text="{TemplateBinding Description}">
-        </TextBlock>
-        <ContentPresenter Grid.Row="2"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-      </Grid>
-    </Grid>
-  </ControlTemplate>
-
-  <ControlTemplate x:Key="InteriorWizardPageTemplate"
-                   TargetType="{x:Type local:WizardPage}">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <Grid Background="{TemplateBinding HeaderBackground}"
-            MinHeight="56">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="*" />
-          <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <StackPanel>
-          <TextBlock Margin="16,9,0,1"
-                     TextWrapping="Wrap"
-                     FontWeight="Bold"
-                     Text="{TemplateBinding Title}">
-          </TextBlock>
-          <TextBlock Margin="32,0,0,3"
-                     TextWrapping="Wrap"
-                     Text="{TemplateBinding Description}">
-          </TextBlock>
-        </StackPanel>
-        <Image Grid.Column="1"
-               Margin="4"
-               Source="{TemplateBinding HeaderImage}"
-               Stretch="None"
-               HorizontalAlignment="Center"
-               VerticalAlignment="Center">
-        </Image>
-      </Grid>
-
-      <Border Grid.Row="1"
-              SnapsToDevicePixels="true"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              BorderBrush="{TemplateBinding BorderBrush}">
-        <Grid Background="{TemplateBinding Background}">
-          <ContentPresenter Margin="14"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-        </Grid>
-      </Border>
-    </Grid>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:WizardPage}">
-    <Style.Triggers>
-      <Trigger Property="PageType"
-               Value="Blank">
-        <Setter Property="Background"
-                Value="{StaticResource PanelBackgroundBrush}" />
-        <Setter Property="BorderThickness"
-                Value="0" />
-        <Setter Property="Template"
-                Value="{StaticResource BlankWizardPageTemplate}" />
-      </Trigger>
-      <Trigger Property="PageType"
-               Value="Exterior">
-        <Setter Property="Background"
-                Value="White" />
-        <Setter Property="BorderThickness"
-                Value="0" />
-        <Setter Property="ExteriorPanelBackground"
-                Value="{StaticResource PanelBackgroundBrush}" />
-        <Setter Property="Template"
-                Value="{StaticResource ExteriorWizardPageTemplate}" />
-      </Trigger>
-      <Trigger Property="PageType"
-               Value="Interior">
-        <Setter Property="Background"
-                Value="{StaticResource PanelBackgroundBrush}" />
-        <Setter Property="BorderBrush"
-                Value="{x:Static SystemColors.ActiveBorderBrush}" />
-        <Setter Property="BorderThickness"
-                Value="0,1,0,0" />
-        <Setter Property="HeaderBackground"
-                Value="White" />
-        <Setter Property="Template"
-                Value="{StaticResource InteriorWizardPageTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
deleted file mode 100644
index fa4a8fa6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
+++ /dev/null
@@ -1,298 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <conv:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
-
-  <Style TargetType="{x:Type local:Wizard}">
-    <Setter Property="Background"
-            Value="#F0F0F0" />
-    <Setter Property="BorderBrush"
-            Value="#A0A0A0" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="ItemsPanel">
-      <Setter.Value>
-        <ItemsPanelTemplate>
-          <Grid />
-        </ItemsPanelTemplate>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:Wizard}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Padding="{TemplateBinding Padding}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-
-              <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
-
-              <Border Grid.Row="1"
-                      BorderBrush="#A0A0A0"
-                      BorderThickness="0,1,0,0"
-                      Padding="7">
-                <StackPanel>
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="Auto" />
-                      <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Button Name="HelpButton"
-                            Grid.Column="0"
-                            MinWidth="75"
-                            Command="local:WizardCommands.Help"
-                            Content="{TemplateBinding HelpButtonContent}">
-                      <Button.Visibility>
-                        <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                          <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                   Path="HelpButtonVisibility" />
-                          <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                   Path="CurrentPage.HelpButtonVisibility" />
-                        </MultiBinding>
-                      </Button.Visibility>
-                    </Button>
-                    <StackPanel Grid.Column="1"
-                                Orientation="Horizontal"
-                                HorizontalAlignment="Right">
-                      <Button Name="BackButton"
-                              MinWidth="75"
-                              Command="local:WizardCommands.PreviousPage"
-                              Content="{TemplateBinding BackButtonContent}">
-                        <Button.Visibility>
-                          <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                     Path="BackButtonVisibility" />
-                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                     Path="CurrentPage.BackButtonVisibility" />
-                          </MultiBinding>
-                        </Button.Visibility>
-                      </Button>
-                      <Grid MinWidth="75"
-                            Margin="2,0,0,0">
-                        <Button Name="NextButton"
-                                Command="local:WizardCommands.NextPage"
-                                Content="{TemplateBinding NextButtonContent}">
-                          <Button.Visibility>
-                            <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                              <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                       Path="NextButtonVisibility" />
-                              <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                       Path="CurrentPage.NextButtonVisibility" />
-                            </MultiBinding>
-                          </Button.Visibility>
-                        </Button>
-                        <Button Name="FinishButton"
-                                Command="local:WizardCommands.Finish"
-                                Content="{TemplateBinding FinishButtonContent}">
-                          <Button.Visibility>
-                            <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                              <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                       Path="FinishButtonVisibility" />
-                              <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                       Path="CurrentPage.FinishButtonVisibility" />
-                            </MultiBinding>
-                          </Button.Visibility>
-                        </Button>
-                      </Grid>
-                      <Button Name="CancelButton"
-                              Margin="7,0,0,0"
-                              MinWidth="75"
-                              Command="local:WizardCommands.Cancel"
-                              Content="{TemplateBinding CancelButtonContent}">
-                        <Button.Visibility>
-                          <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                     Path="CancelButtonVisibility" />
-                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                     Path="CurrentPage.CancelButtonVisibility" />
-                          </MultiBinding>
-                        </Button.Visibility>
-                      </Button>
-                    </StackPanel>
-                  </Grid>
-                </StackPanel>
-              </Border>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="True"
-                     SourceName="FinishButton">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="FinishButton" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <ControlTemplate x:Key="BlankWizardPageTemplate"
-                   TargetType="{x:Type local:WizardPage}">
-    <Border SnapsToDevicePixels="true"
-            Background="{TemplateBinding Background}"
-            BorderThickness="{TemplateBinding BorderThickness}"
-            BorderBrush="{TemplateBinding BorderBrush}">
-      <Grid Background="{TemplateBinding Background}">
-        <ContentPresenter Margin="14"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-      </Grid>
-    </Border>
-  </ControlTemplate>
-
-  <ControlTemplate x:Key="ExteriorWizardPageTemplate"
-                   TargetType="{x:Type local:WizardPage}">
-    <Grid Background="{TemplateBinding Background}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-      <Border SnapsToDevicePixels="true"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              BorderBrush="{TemplateBinding BorderBrush}">
-        <Grid Grid.Column="0"
-              Background="{TemplateBinding ExteriorPanelBackground}"
-              MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
-          <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
-        </Grid>
-      </Border>
-      <Grid Column="1"
-            Margin="14">
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <TextBlock Grid.Row="0"
-                   TextWrapping="Wrap"
-                   Margin="0,0,0,14"
-                   FontSize="16"
-                   FontWeight="Bold"
-                   Text="{TemplateBinding Title}" >
-        </TextBlock>
-        <TextBlock Grid.Row="1"
-                   TextWrapping="Wrap"
-                   Margin="0,0,0,14"
-                   Text="{TemplateBinding Description}" >
-        </TextBlock>
-        <ContentPresenter Grid.Row="2"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-      </Grid>
-    </Grid>
-  </ControlTemplate>
-
-  <ControlTemplate x:Key="InteriorWizardPageTemplate"
-                   TargetType="{x:Type local:WizardPage}">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <Grid Background="{TemplateBinding HeaderBackground}"
-            MinHeight="56">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="*" />
-          <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <StackPanel>
-          <TextBlock Margin="16,9,0,1"
-                     TextWrapping="Wrap"
-                     FontWeight="Bold"
-                     Text="{TemplateBinding Title}" >
-          </TextBlock>
-          <TextBlock Margin="32,0,0,3"
-                     TextWrapping="Wrap"
-                     Text="{TemplateBinding Description}" >
-          </TextBlock>
-        </StackPanel>
-        <Image Grid.Column="1"
-               Margin="4"
-               Source="{TemplateBinding HeaderImage}"
-               Stretch="None"
-               HorizontalAlignment="Center"
-               VerticalAlignment="Center" >
-        </Image>
-      </Grid>
-
-      <Border Grid.Row="1"
-              SnapsToDevicePixels="true"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              BorderBrush="{TemplateBinding BorderBrush}">
-        <Grid Background="{TemplateBinding Background}">
-          <ContentPresenter Margin="14"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-        </Grid>
-      </Border>
-    </Grid>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:WizardPage}">
-    <Style.Triggers>
-      <Trigger Property="PageType"
-               Value="Blank">
-        <Setter Property="Background"
-                Value="#FFF0F0F0" />
-        <Setter Property="BorderThickness"
-                Value="0" />
-        <Setter Property="Template"
-                Value="{StaticResource BlankWizardPageTemplate}" />
-      </Trigger>
-      <Trigger Property="PageType"
-               Value="Exterior">
-        <Setter Property="Background"
-                Value="#FFFFFF" />
-        <Setter Property="BorderThickness"
-                Value="0" />
-        <Setter Property="ExteriorPanelBackground"
-                Value="#E3EFFF" />
-        <Setter Property="Template"
-                Value="{StaticResource ExteriorWizardPageTemplate}" />
-      </Trigger>
-      <Trigger Property="PageType"
-               Value="Interior">
-        <Setter Property="Background"
-                Value="#FFF0F0F0" />
-        <Setter Property="BorderBrush"
-                Value="{x:Static SystemColors.ActiveBorderBrush}" />
-        <Setter Property="BorderThickness"
-                Value="0,1,0,0" />
-        <Setter Property="HeaderBackground"
-                Value="#FFFFFF" />
-        <Setter Property="Template"
-                Value="{StaticResource InteriorWizardPageTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
deleted file mode 100644
index 6e0bf354..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
+++ /dev/null
@@ -1,806 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2C3149D9-832B-4754-A27B-898A392344B5}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xceed.Wpf.Toolkit</RootNamespace>
-    <AssemblyName>Xceed.Wpf.Toolkit</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkSubset>Client</TargetFrameworkSubset>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;VS2008</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;VS2008</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="UIAutomationProvider">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\WPFToolkit.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="BusyIndicator\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="BusyIndicator\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="IconButton\Themes\Aero2.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="IconButton\Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ButtonSpinner\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ButtonSpinner\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CalculatorUpDown\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CalculatorUpDown\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Calculator\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Calculator\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CheckComboBox\Themes\Aero2.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="CheckListBox\Themes\Aero2.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="CheckListBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ChildWindow\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ChildWindow\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Chromes\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Chromes\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CollectionControl\Implementation\CollectionControlDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="CollectionControl\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CollectionControl\Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ColorCanvas\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ColorCanvas\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ColorPicker\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ColorPicker\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CheckComboBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Aero2\SelectorItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Aero2\WindowControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Generic\SelectorItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Generic\WindowControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DateTimePicker\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DateTimePicker\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DateTimeUpDown\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DateTimeUpDown\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DropDownButton\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DropDownButton\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Magnifier\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MessageBox\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MessageBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MultiLineTextEditor\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MultiLineTextEditor\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="NumericUpDown\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="NumericUpDown\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Pie\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Pie\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="PropertyGrid\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="PropertyGrid\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RangeSlider\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RangeSlider\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RichTextBoxFormatBar\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SplitButton\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SplitButton\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero2\Brushes.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero2\Buttons.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero2\Common.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero2\Glyphs.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero\Brushes_NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero\Buttons_NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\classic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Generic\Brushes.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Generic\Buttons.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Generic\Common.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Generic\Glyphs.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\luna.homestead.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\luna.metallic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\luna.normalcolor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\royale.normalcolor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TimePicker\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TimePicker\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TimeSpanUpDown\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TimeSpanUpDown\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="WatermarkComboBox\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="WatermarkComboBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="WatermarkTextBox\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="WatermarkTextBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Wizard\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Wizard\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Zoombox\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Zoombox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyVersionInfo.cs" />
-    <Compile Include="AssemblyVersionInfoCommon.cs" />
-    <Compile Include="AutoSelectTextBox\Implementation\AutoSelectBehaviorEnum.cs" />
-    <Compile Include="AutoSelectTextBox\Implementation\AutoSelectTextBox.cs" />
-    <Compile Include="AutoSelectTextBox\Implementation\QueryMoveFocusEventArgs.cs" />
-    <Compile Include="BusyIndicator\Implementation\BusyIndicator.cs" />
-    <Compile Include="BusyIndicator\Implementation\Converters\ProgressBarWidthConverter.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorPickerTabItem.cs" />
-    <Compile Include="Core\Converters\ColorModeToTabItemSelectedConverter.cs" />
-    <Compile Include="Primitives\SelectAllSelectorItem.cs" />
-    <Compile Include="Primitives\SelectAllSelector.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\PropertyItemEditorConverter.cs" />
-    <Compile Include="Core\LocationEnum.cs" />
-    <Compile Include="IconButton\Implementation\IconButton.cs" />
-    <Compile Include="ButtonSpinner\Implementation\ButtonSpinner.cs" />
-    <Compile Include="CalculatorUpDown\Implementation\CalculatorUpDown.cs" />
-    <Compile Include="Calculator\Implementation\Calculator.cs" />
-    <Compile Include="Calculator\Implementation\CalculatorCommands.cs" />
-    <Compile Include="CheckListBox\Implementation\CheckListBox.cs" />
-    <Compile Include="ChildWindow\Implementation\ChildWindow.cs" />
-    <Compile Include="ChildWindow\Implementation\WindowStartupLocation.cs" />
-    <Compile Include="ChildWindow\Implementation\WindowState.cs" />
-    <Compile Include="ButtonSpinner\Implementation\SpinDirection.cs" />
-    <Compile Include="ButtonSpinner\Implementation\SpinEventArgs.cs" />
-    <Compile Include="ButtonSpinner\Implementation\Spinner.cs" />
-    <Compile Include="ButtonSpinner\Implementation\ValidSpinDirections.cs" />
-    <Compile Include="Chromes\Implementation\ButtonChrome.cs" />
-    <Compile Include="CheckComboBox\Implementation\CheckComboBox.cs" />
-    <Compile Include="CollectionControl\Implementation\CollectionControl.cs" />
-    <Compile Include="CollectionControl\Implementation\CollectionControlButton.cs" />
-    <Compile Include="CollectionControl\Implementation\CollectionControlDialog.xaml.cs">
-      <DependentUpon>CollectionControlDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="CollectionControl\Implementation\Converters\NewItemTypesComboBoxConverter.cs" />
-    <Compile Include="CollectionControl\Implementation\ItemAddingEventArgs.cs" />
-    <Compile Include="CollectionControl\Implementation\ItemDeletingEventArgs.cs" />
-    <Compile Include="CollectionControl\Implementation\ItemEventArgs.cs" />
-    <Compile Include="CollectionControl\Implementation\PrimitiveTypeCollectionControl.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorSorter.cs" />
-    <Compile Include="Core\CancelRoutedEventArgs.cs" />
-    <Compile Include="Core\Converters\AditionConverter.cs" />
-    <Compile Include="Core\Converters\CenterTitleConverter.cs" />
-    <Compile Include="Core\Converters\ColorBlendConverter.cs" />
-    <Compile Include="Core\Converters\CornerRadiusToDoubleConverter.cs" />
-    <Compile Include="Core\Converters\HalfConverter.cs" />
-    <Compile Include="Core\Converters\IntToThicknessConverter.cs" />
-    <Compile Include="Core\Converters\NullToBoolConverter.cs" />
-    <Compile Include="Core\Converters\ThicknessSideRemovalConverter.cs" />
-    <Compile Include="Core\Converters\ThicknessToDoubleConverter.cs" />
-    <Compile Include="Core\EditableKeyValuePair.cs" />
-    <Compile Include="Primitives\DateTimePickerBase.cs" />
-    <Compile Include="Core\Utilities\DateTimeUtilities.cs" />
-    <Compile Include="PropertyGrid\Implementation\CategoryGroupStyleSelector.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\IsDefaultCategoryConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\IsStringEmptyConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\CollectionEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\SourceComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\TrimmedTextBlock.cs" />
-    <Compile Include="Core\Converters\WindowContentBorderMarginConverter.cs" />
-    <Compile Include="Core\Converters\WindowControlBackgroundConverter.cs" />
-    <Compile Include="Core\Input\IValidateInput.cs" />
-    <Compile Include="Core\Input\InputValidationErrorEventArgs.cs" />
-    <Compile Include="Core\Media\Animation\AnimationRate.cs" />
-    <Compile Include="Core\Media\Animation\AnimationRateConverter.cs" />
-    <Compile Include="Core\Media\Animation\IterativeAnimationEquation.cs" />
-    <Compile Include="Core\Media\Animation\IterativeAnimationEquationDelegate.cs" />
-    <Compile Include="Core\Media\Animation\IterativeEquationConverter.cs" />
-    <Compile Include="Core\Media\Animation\PennerEquation.cs" />
-    <Compile Include="Core\Media\Animation\PennerEquations.cs" />
-    <Compile Include="Core\Media\WindowColors.cs" />
-    <Compile Include="Primitives\CachedTextInfo.cs" />
-    <Compile Include="Core\Converters\ObjectTypeToNameConverter.cs" />
-    <Compile Include="ColorCanvas\Implementation\ColorCanvas.cs" />
-    <Compile Include="Core\Converters\CalculatorMemoryToVisibilityConverter.cs" />
-    <Compile Include="Core\Converters\RoundedValueConverter.cs" />
-    <Compile Include="Core\Converters\VisibilityToBoolConverter.cs" />
-    <Compile Include="Core\Converters\WizardPageButtonVisibilityConverter.cs" />
-    <Compile Include="Core\ErrorMessages.cs" />
-    <Compile Include="Core\IndexChangedEventArgs.cs" />
-    <Compile Include="Core\IndexChangedEventHandler.cs" />
-    <Compile Include="Core\Input\KeyModifier.cs" />
-    <Compile Include="Core\Input\KeyModifierCollection.cs" />
-    <Compile Include="Core\Input\KeyModifierCollectionConverter.cs" />
-    <Compile Include="Core\InvalidContentException.cs" />
-    <Compile Include="Core\InvalidTemplateException.cs" />
-    <Compile Include="Primitives\DateTimeUpDownBase.cs" />
-    <Compile Include="Primitives\HsvColor.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorItem.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorPicker.cs" />
-    <Compile Include="Primitives\MouseWheelActiveTriggerEnum.cs" />
-    <Compile Include="Primitives\WindowContainer.cs" />
-    <Compile Include="Primitives\WindowControl.cs" />
-    <Compile Include="Core\Utilities\ChangeTypeHelper.cs" />
-    <Compile Include="Core\Utilities\FontUtilities.cs" />
-    <Compile Include="Core\Utilities\GeneralUtilities.cs" />
-    <Compile Include="Core\Utilities\KeyboardUtilities.cs" />
-    <Compile Include="Core\Utilities\ListUtilities.cs" />
-    <Compile Include="Core\Utilities\PropertyChangedExt.cs" />
-    <Compile Include="Core\Utilities\RoutedEventHelper.cs" />
-    <Compile Include="Core\Utilities\WeakEventListener.cs" />
-    <Compile Include="Core\Utilities\WindowUtilities.cs" />
-    <Compile Include="Core\VersionResourceDictionary.cs" />
-    <Compile Include="Core\WeakCollectionChangedWrapper.cs" />
-    <Compile Include="NumericUpDown\Implementation\AllowedSpecialValuesEnum.cs" />
-    <Compile Include="Panels\AnimatorConverter.cs" />
-    <Compile Include="Panels\Animators.cs" />
-    <Compile Include="Panels\ChildEnteredEventArgs.cs" />
-    <Compile Include="Panels\ChildEnteredEventHandler.cs" />
-    <Compile Include="Panels\ChildEnteringEventArgs.cs" />
-    <Compile Include="Panels\ChildEnteringEventHandler.cs" />
-    <Compile Include="Panels\ChildExitedEventArgs.cs" />
-    <Compile Include="Panels\ChildExitedEventHandler.cs" />
-    <Compile Include="Panels\ChildExitingEventArgs.cs" />
-    <Compile Include="Panels\ChildExitingEventHandler.cs" />
-    <Compile Include="Panels\DoubleAnimator.cs" />
-    <Compile Include="Panels\IterativeAnimator.cs" />
-    <Compile Include="Panels\PanelBase.cs" />
-    <Compile Include="Primitives\Selector.cs" />
-    <Compile Include="Primitives\SelectorItem.cs" />
-    <Compile Include="Primitives\ShapeBase.cs" />
-    <Compile Include="Primitives\ValueRangeTextBox.cs" />
-    <Compile Include="Core\PropertyChangedEventArgs.cs" />
-    <Compile Include="Core\PropertyChangedEventHandler.cs" />
-    <Compile Include="Core\QueryTextFromValueEventArgs.cs" />
-    <Compile Include="Core\QueryValueFromTextEventArgs.cs" />
-    <Compile Include="Core\Utilities\CalculatorUtilities.cs" />
-    <Compile Include="Core\Utilities\ColorUtilities.cs" />
-    <Compile Include="ColorCanvas\Implementation\ColorSpectrumSlider.cs" />
-    <Compile Include="Core\Converters\ColorToSolidColorBrushConverter.cs" />
-    <Compile Include="Core\Converters\InverseBoolConverter.cs" />
-    <Compile Include="Core\Converters\SolidColorBrushToColorConverter.cs" />
-    <Compile Include="Core\Utilities\ContextMenuUtilities.cs" />
-    <Compile Include="Core\Utilities\TreeHelper.cs" />
-    <Compile Include="Core\Utilities\ValueChangeHelper.cs" />
-    <Compile Include="Core\Utilities\DoubleHelper.cs" />
-    <Compile Include="Core\Utilities\EllipseHelper.cs" />
-    <Compile Include="Core\Utilities\PointHelper.cs" />
-    <Compile Include="Core\Utilities\RectHelper.cs" />
-    <Compile Include="Core\Utilities\ReflectionHelper.cs" />
-    <Compile Include="Core\Utilities\ResourceHelper.cs" />
-    <Compile Include="Core\Utilities\Segment.cs" />
-    <Compile Include="Core\Utilities\VisualTreeHelperEx.cs" />
-    <Compile Include="DateTimePicker\Implementation\DateTimePicker.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeFormat.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeInfo.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimePart.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeUpDown.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeParser.cs" />
-    <Compile Include="DropDownButton\Implementation\DropDownButton.cs" />
-    <Compile Include="Magnifier\Implementation\FrameType.cs" />
-    <Compile Include="MaskedTextBox\Implementation\AutoCompletingMaskEventArgs.cs" />
-    <Compile Include="MaskedTextBox\Implementation\InsertKeyModeEnum.cs" />
-    <Compile Include="MaskedTextBox\Implementation\MaskedTextBox.cs" />
-    <Compile Include="MaskedTextBox\Implementation\MaskFormatEnum.cs" />
-    <Compile Include="MultiLineTextEditor\Implementation\MultiLineTextEditor.cs" />
-    <Compile Include="NumericUpDown\Implementation\ByteUpDown.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="NumericUpDown\Implementation\CommonNumericUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\DecimalUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\DoubleUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\SByteUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\SingleUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\IntegerUpDown.cs" />
-    <Compile Include="Core\Converters\BorderThicknessToStrokeThicknessConverter.cs" />
-    <Compile Include="Magnifier\Implementation\Converters\RadiusConverter.cs" />
-    <Compile Include="Magnifier\Implementation\Magnifier.cs" />
-    <Compile Include="Magnifier\Implementation\MagnifierAdorner.cs" />
-    <Compile Include="Magnifier\Implementation\MagnifierManager.cs" />
-    <Compile Include="Primitives\InputBase.cs" />
-    <Compile Include="Obselete\MaskedTextBox\Implementation\MaskedTextBox.cs" />
-    <Compile Include="MessageBox\Implementation\MessageBox.cs" />
-    <Compile Include="NumericUpDown\Implementation\LongUpDown.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="NumericUpDown\Implementation\NumericUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\ShortUpDown.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="NumericUpDown\Implementation\UIntegerUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\ULongUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\UShortUpDown.cs" />
-    <Compile Include="Panels\AnimationPanel.cs" />
-    <Compile Include="Panels\RandomPanel.cs" />
-    <Compile Include="Panels\ScrollHelper.cs" />
-    <Compile Include="Panels\SwitchPanel.cs" />
-    <Compile Include="Panels\SwitchPresenter.cs" />
-    <Compile Include="Panels\SwitchTemplate.cs" />
-    <Compile Include="Panels\WrapPanel.cs" />
-    <Compile Include="Pie\Implementation\Pie.cs" />
-    <Compile Include="Pie\Implementation\PieModeEnum.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="BusyIndicator\Implementation\VisualStates.BusyIndicator.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\CategoryOrderAttribute.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\ExpandableObjectAttribute.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\IItemsSource.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\ItemsSourceAttribute.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\NewItemTypesAttribute.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\PropertyOrderAttribute.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\ObjectToUIElementConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Commands\PropertyGridCommands.cs" />
-    <Compile Include="PropertyGrid\Implementation\CommonPropertyExceptionValidationRule.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\ListConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\SelectedObjectConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\EditorTimeSpanConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\CustomPropertyItem.cs" />
-    <Compile Include="PropertyGrid\Implementation\Definitions\EditorTemplateDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\Definitions\PropertyDefinitionBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\Definitions\EditorDefinitionBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\MaskedTextBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyDefinitionBaseCollection.cs" />
-    <Compile Include="PropertyGrid\Implementation\FilterInfo.cs" />
-    <Compile Include="PropertyGrid\Implementation\ObjectContainerHelperBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinitionBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\CheckBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ColorEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\EditorDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\EnumComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceAttributeEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\UpDownEditors.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ITypeEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\PrimitiveTypeCollectionEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\TextBlockEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\TextBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\TypeEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\ExpandableObjectMarginConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\IPropertyContainer.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyGrid.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyItemsControl.cs" />
-    <Compile Include="PropertyGrid\Implementation\ContainerHelperBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyItem.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyItemCollection.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyItemBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\Commands\PropertyItemCommands.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyGridUtilities.cs" />
-    <Compile Include="PropertyGrid\Implementation\ObjectContainerHelper.cs" />
-    <Compile Include="PropertyGrid\Implementation\StringConstants.cs" />
-    <Compile Include="PropertyGrid\Implementation\TargetPropertyType.cs" />
-    <Compile Include="RangeSlider\Implementation\Converters\SliderThumbWidthConverter.cs" />
-    <Compile Include="RangeSlider\Implementation\RangeSlider.cs" />
-    <Compile Include="RichTextBoxFormatBar\IRichTextBoxFormatBar.cs" />
-    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBar.cs" />
-    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBarManager.cs" />
-    <Compile Include="Core\UIElementAdorner.cs" />
-    <Compile Include="RichTextBox\Formatters\ITextFormatter.cs" />
-    <Compile Include="RichTextBox\Formatters\PlainTextFormatter.cs" />
-    <Compile Include="RichTextBox\Formatters\RtfFormatter.cs" />
-    <Compile Include="RichTextBox\Formatters\XamlFormatter.cs" />
-    <Compile Include="RichTextBox\RichTextBox.cs" />
-    <Compile Include="Primitives\UpDownBase.cs" />
-    <Compile Include="SplitButton\Implementation\SplitButton.cs" />
-    <Compile Include="Primitives\Themes\ResourceKeys.cs" />
-    <Compile Include="StyleableWindow\Implementation\Converters\StyleableWindowClippingBorderConverter.cs" />
-    <Compile Include="TimelinePanel\Implementation\DateElement.cs" />
-    <Compile Include="TimelinePanel\Implementation\OverlapBehavior.cs" />
-    <Compile Include="TimelinePanel\Implementation\TimelinePanel.cs" />
-    <Compile Include="TimePicker\Implementation\TimeItem.cs" />
-    <Compile Include="TimePicker\Implementation\TimePicker.cs" />
-    <Compile Include="TimeSpanUpDown\Implementation\TimeSpanUpDown.cs" />
-    <Compile Include="VisualStates.cs" />
-    <Compile Include="MessageBox\Implementation\VisualStates.MessageBox.cs" />
-    <Compile Include="WatermarkComboBox\Implementation\WatermarkComboBox.cs" />
-    <Compile Include="WatermarkPasswordBox\Implementation\WatermarkPasswordBox.cs" />
-    <Compile Include="WatermarkTextBox\Implementation\WatermarkTextBox.cs" />
-    <Compile Include="Wizard\Implementation\WizardCommands.cs" />
-    <Compile Include="Wizard\Implementation\WizardPage.cs" />
-    <Compile Include="Wizard\Implementation\Wizard.cs" />
-    <Compile Include="Wizard\Implementation\WizardPageButtonVisibility.cs" />
-    <Compile Include="Wizard\Implementation\WizardPageType.cs" />
-    <AppDesigner Include="Properties\" />
-    <Compile Include="Zoombox\Zoombox.cs" />
-    <Compile Include="Zoombox\ZoomboxCursors.cs" />
-    <Compile Include="Zoombox\ZoomboxView.cs" />
-    <Compile Include="Zoombox\ZoomboxViewChangedEventArgs.cs" />
-    <Compile Include="Zoombox\ZoomboxViewChangedEventHandler.cs" />
-    <Compile Include="Zoombox\ZoomboxViewConverter.cs" />
-    <Compile Include="Zoombox\ZoomboxViewException.cs" />
-    <Compile Include="Zoombox\ZoomboxViewFinderDisplay.cs" />
-    <Compile Include="Zoombox\ZoomboxViewKind.cs" />
-    <Compile Include="Zoombox\ZoomboxViewStack.cs" />
-    <Compile Include="Zoombox\ZoomboxViewStackMode.cs" />
-    <Compile Include="Zoombox\ZoomboxZoomOn.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="MessageBox\Icons\Error48.png" />
-    <Resource Include="MessageBox\Icons\Information48.png" />
-    <Resource Include="MessageBox\Icons\Question48.png" />
-    <Resource Include="MessageBox\Icons\Warning48.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\Bold16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\CenterAlign16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\Italic16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\JustifyAlign16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\LeftAlign16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\RightAlign16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\Underline16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\FontColorPicker16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\TextHighlightColorPicker16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\Bullets16.png" />
-    <Resource Include="RichTextBoxFormatBar\Images\Numbering16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\SortAscending16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\Categorize16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\AdvancedProperties11.png" />
-    <Resource Include="PropertyGrid\Images\Inheritance11.png" />
-    <Resource Include="PropertyGrid\Images\Resource11.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\Database11.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\Local11.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\Style11.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\ClearFilter16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="MultiLineTextEditor\Images\Notes16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Zoombox\Resources\Zoom.cur" />
-    <Resource Include="Zoombox\Resources\ZoomRelative.cur" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Core\ErrorMessages.resx">
-      <DependentUpon>ErrorMessages.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CollectionControl\Images\Delete16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Themes\Generic\Images\close_hover.png" />
-    <Resource Include="Themes\Generic\Images\close_inactive.png" />
-    <Resource Include="Themes\Generic\Images\close_normal.png" />
-    <Resource Include="Themes\Generic\Images\close_pressed.png" />
-    <Resource Include="Themes\Generic\Images\close_rounded_hover.png" />
-    <Resource Include="Themes\Generic\Images\close_rounded_inactive.png" />
-    <Resource Include="Themes\Generic\Images\close_rounded_normal.png" />
-    <Resource Include="Themes\Generic\Images\close_rounded_pressed.png" />
-    <Resource Include="Themes\Generic\Images\close_toolwindow_hover.png" />
-    <Resource Include="Themes\Generic\Images\close_toolwindow_inactive.png" />
-    <Resource Include="Themes\Generic\Images\close_toolwindow_normal.png" />
-    <Resource Include="Themes\Generic\Images\close_toolwindow_pressed.png" />
-    <Resource Include="Themes\Generic\Images\maximize_disabled.png" />
-    <Resource Include="Themes\Generic\Images\maximize_hover.png" />
-    <Resource Include="Themes\Generic\Images\maximize_inactive.png" />
-    <Resource Include="Themes\Generic\Images\maximize_normal.png" />
-    <Resource Include="Themes\Generic\Images\maximize_pressed.png" />
-    <Resource Include="Themes\Generic\Images\minimize_hover.png" />
-    <Resource Include="Themes\Generic\Images\minimize_inactive.png" />
-    <Resource Include="Themes\Generic\Images\minimize_normal.png" />
-    <Resource Include="Themes\Generic\Images\minimize_pressed.png" />
-    <Resource Include="Themes\Generic\Images\resize_grip.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Themes\Generic\Images\restore_disabled.png" />
-    <Resource Include="Themes\Generic\Images\restore_hover.png" />
-    <Resource Include="Themes\Generic\Images\restore_inactive.png" />
-    <Resource Include="Themes\Generic\Images\restore_normal.png" />
-    <Resource Include="Themes\Generic\Images\restore_pressed.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="PropertyGrid\Implementation\Definitions\DefinitionBase.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CollectionControl\Images\Duplicate.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-  </PropertyGroup>
-  <PropertyGroup>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur
deleted file mode 100644
index f5001727..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur
deleted file mode 100644
index 7df27fd6..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 5731a303..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,833 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Zoombox"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-  <conv:RoundedValueConverter x:Key="RoundedValueConverter"
-                              Precision="2" />
-  <conv:VisibilityToBoolConverter x:Key="TrueIfVisibleConverter"
-                                  Inverted="False"
-                                  Not="False" />
-  <conv:VisibilityToBoolConverter x:Key="TrueIfNotVisibleConverter"
-                                  Inverted="False"
-                                  Not="True" />
-  <conv:VisibilityToBoolConverter x:Key="VisibleIfTrueConverter"
-                                  Inverted="True"
-                                  Not="False" />
-  <conv:VisibilityToBoolConverter x:Key="VisibleIfNotTrueConverter"
-                                  Inverted="True"
-                                  Not="True" />
-
-  <SolidColorBrush x:Key="GlyphBrush"
-                   Color="white" />
-
-  <Style x:Key="TransparentButton"
-         TargetType="{x:Type ButtonBase}"
-         BasedOn="{x:Null}">
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Background"
-            Value="#333333" />
-    <Setter Property="Foreground"
-            Value="#cccccc" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ButtonBase}">
-          <Grid Background="Transparent"
-                Cursor="Hand">
-            <Rectangle Fill="{TemplateBinding Background}"
-                       Stroke="{TemplateBinding Foreground}"
-                       RadiusX="3"
-                       RadiusY="3"
-                       x:Name="BackgroundTextBoxRectangle"
-                       Opacity="0" />
-            <ContentPresenter />
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Opacity"
-                      Value="0.4" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="BackgroundTextBoxRectangle"
-                      Property="Opacity"
-                      Value="1" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocusWithin"
-                     Value="True">
-              <Setter TargetName="BackgroundTextBoxRectangle"
-                      Property="Opacity"
-                      Value="1" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ViewFinderToggleButtonStyle"
-         BasedOn="{StaticResource TransparentButton}"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="Visibility"
-            Value="Visible" />
-    <Style.Triggers>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Zoombox}}, Path=ViewFinderVisibility}"
-                   Value="Hidden">
-        <Setter Property="Visibility"
-                Value="Collapsed" />
-      </DataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <DrawingImage x:Key="ShowViewFinderGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup>
-          <DrawingGroup.Transform>
-            <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,11.533,0.664" />
-          </DrawingGroup.Transform>
-          <GeometryDrawing Brush="#FF000000"
-                           Geometry="M8.823,9.895 
-              L12.440,13.460 10.784,15.092 15.347,15.092 15.347,15.125 
-              9.651,15.125 11.306,13.493 8.239,10.470 8.823,9.895 z 
-              M15.347,9.511 L15.347,10.595 14.842,11.093 14.292,10.551
-              15.347,9.511 z M0,9.481 L1.133,10.598 1.133,15.092 
-              5.694,15.092 5.727,15.125 0,15.125 0,9.481 z M14.842,3.963 
-              L15.347,4.461 15.347,5.611 14.258,4.538 14.842,3.963 z 
-              M2.793,3.952 L6.410,7.517 2.793,11.082 2.243,10.540 
-              5.276,7.551 2.209,4.527 2.793,3.952 z M9.653,0 L10.821,0 
-              12.429,1.585 8.812,5.150 8.262,4.608 11.296,1.618 9.653,0 z
-              M0,0 L1.133,0 1.133,4.504 0,5.621 0,0 z" />
-        </DrawingGroup>
-        <DrawingGroup>
-          <DrawingGroup.Transform>
-            <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.048,1.182" />
-          </DrawingGroup.Transform>
-          <GeometryDrawing Brush="#4B5F5F5F"
-                           Geometry="M0,0 L5.703,0 
-              4.061,1.618 7.678,5.183 11.295,1.618 9.653,0 15.347,0 15.347,5.611
-              13.704,3.996 10.091,7.561 13.708,11.126 15.347,9.511 15.347,15.125 
-              9.651,15.125 11.306,13.493 7.689,9.928 4.071,13.493 5.727,15.125 
-              0,15.125 0,9.480 1.659,11.115 5.276,7.551 1.659,3.986 0,5.621 0,0 z" />
-        </DrawingGroup>
-        <DrawingGroup>
-          <DrawingGroup.Transform>
-            <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.186,1.538" />
-          </DrawingGroup.Transform>
-          <GeometryDrawing Brush="#FFFFFFFF"
-                           Geometry="M6.867,9.820 L7.334,10.280 
-              4.072,13.494 5.727,15.126 0,15.126 0,15.016 4.906,15.016 3.250,13.384
-              6.867,9.820 z M15.347,9.512 L15.347,15.126 9.651,15.126 9.762,15.016
-              14.525,15.016 14.525,10.322 15.347,9.512 z M0,9.481 L1.193 ,10.657 
-              0.837,11.007 0,10.182 0,9.481 z M12.887,3.888 L13.353,4.347 
-              10.091,7.56 13.242,10.667 12.887,11.018 9.270,7.453 12.887,3.888 z
-              M0.837,3.878 L1.303,4.337 0,5.621 0,4.703 0.837,3.878 z M14.525,0 
-              L15.347,0 15.347,5.612 14.525,4.802 14.525,0 z M4.772,0 L5.703,0
-              4.061,1.617 7.212,4.724 6.857,5.075 3.239,1.511 4.772,0 z" />
-        </DrawingGroup>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="FillToBoundsGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Geometry="F1 M 218.138,210.145L 255.599,210.145L
-              255.599,246.628L 218.138,246.628L 218.138,210.145 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1.2"
-                   LineJoin="Round"
-                   Brush="{StaticResource GlyphBrush}" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 249.378,215.741L 249.378,215.743L 249.383,215.743L 
-              249.383,219.159L 249.378,219.159L 249.378,224.598L 245.962,224.598L 
-              245.962,219.159L 240.525,219.159L 240.525,215.743L 245.962,215.743L 
-              245.962,215.741L 249.378,215.741 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 249.383,240.726L 249.381,240.726L 249.381,240.73L 
-              245.965,240.73L 245.965,240.726L 240.526,240.726L 240.526,237.31L 
-              245.965,237.31L 245.965,231.873L 249.381,231.873L 249.381,237.31L 
-              249.383,237.31L 249.383,240.726 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 247.539,220.321L 239.801,228.059L 247.539,235.796L 
-              244.962,238.373L 237.224,230.635L 229.487,238.373L 226.91,235.796L 
-              234.648,228.059L 226.91,220.321L 229.487,217.744L 237.224,225.482L 
-              244.962,217.744L 247.539,220.321 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 224.879,240.73L 224.879,240.729L 224.874,240.729L 
-              224.874,237.312L 224.879,237.312L 224.879,231.873L 228.295,231.873L 
-              228.295,237.312L 233.732,237.312L 233.732,240.729L 228.295,240.729L 
-              228.295,240.73L 224.879,240.73 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 224.874,215.746L 224.876,215.746L 224.876,215.741L 
-              228.292,215.741L 228.292,215.746L 233.731,215.746L 233.731,219.162L 
-              228.292,219.162L 228.292,224.598L 224.876,224.598L 224.876,219.162L 
-              224.874,219.162L 224.874,215.746 Z" />
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="FitContentGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Geometry="F1 M 267.334,210.477L 304.795,210.477L 
-              304.795,246.96L 267.334,246.96L 267.334,210.477 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1.2"
-                   LineJoin="Round"
-                   Brush="{StaticResource GlyphBrush}" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 298.574,216.073L 298.574,216.075L 298.579,216.075L 
-              298.579,219.491L 298.574,219.491L 298.574,224.93L 295.158,224.93L 
-              295.158,219.491L 289.721,219.491L 289.721,216.075L 295.158,216.075L 
-              295.158,216.073L 298.574,216.073 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 298.579,241.058L 298.577,241.058L 298.577,241.062L 
-              295.161,241.062L 295.161,241.058L 289.722,241.058L 289.722,237.642L 
-              295.161,237.642L 295.161,232.205L 298.577,232.205L 298.577,237.642L 
-              298.579,237.642L 298.579,241.058 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 274.075,241.062L 274.075,241.061L 274.07,241.061L 
-              274.07,237.644L 274.075,237.644L 274.075,232.205L 277.491,232.205L 
-              277.491,237.644L 282.928,237.644L 282.928,241.061L 277.491,241.061L 
-              277.491,241.062L 274.075,241.062 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 274.07,216.078L 274.072,216.078L 274.072,216.073L 
-              277.488,216.073L 277.488,216.078L 282.927,216.078L 282.927,219.494L 
-              277.488,219.494L 277.488,224.93L 274.072,224.93L 274.072,219.494L 
-              274.07,219.494L 274.07,216.078 Z" />
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="CenterGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Geometry="F1 M 315.334,209.944L 352.795,209.944L 
-              352.795,246.427L 315.334,246.427L 315.334,209.944 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1.2"
-                   LineJoin="Round"
-                   Brush="{StaticResource GlyphBrush}" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 328.878,223.652L 338.19,223.652C 338.27,223.652 
-              338.334,223.716 338.334,223.796L 338.334,233.108C 338.334,233.188 
-              338.27,233.252 338.19,233.252L 328.878,233.252C 328.799,233.252 
-              328.734,233.188 328.734,233.108L 328.734,223.796C 328.734,223.716 
-              328.799,223.652 328.878,223.652 Z" />
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="RefocusGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup>
-          <DrawingGroup.Transform>
-            <MatrixTransform Matrix="1,0,0,1,0.667,1.667" />
-          </DrawingGroup.Transform>
-          <GeometryDrawing Brush="#FFFFFFFF"
-                           Geometry="M6.624,0 C10.281,0 
-              13.247,2.836 13.247,6.334 13.247,7.176 13.075,7.980 12.734,8.703
-              L14.666,10.550 14.666,10.631 8.989,10.631 8.989,5.202 9.072,5.202
-              10.971,7.018 C11.095,6.810 11.116,6.573 11.116,6.331 11.116,3.959
-              9.104,2.034 6.622,2.034 4.139,2.034 2.127,3.959 2.127,6.331
-              2.127,8.575 3.925,10.417 6.224,10.552 L8.220,12.461 C7.712,12.602
-              7.176,12.667 6.624,12.667 2.966,12.667 0,9.831 0,6.334 0,2.836
-              2.966,0 6.624,0 z" />
-        </DrawingGroup>
-        <GeometryDrawing Brush="#00FFFFFF">
-          <GeometryDrawing.Geometry>
-            <RectangleGeometry RadiusX="0"
-                               RadiusY="0"
-                               Rect="0,0,16,16" />
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="HomeGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Geometry="F1 M 414.001,209.411L 451.462,209.411L 
-              451.462,245.893L 414.001,245.893L 414.001,209.411 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1.2"
-                   LineJoin="Round"
-                   Brush="transparent" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 442.009,240.438C 442.009,240.534 441.886,240.612 
-              441.735,240.612L 423.992,240.612C 423.841,240.612 423.718,240.534 
-              423.718,240.438L 423.718,229.595L 418.991,229.595C 418.874,229.479 
-              418.874,229.289 418.991,229.173L 432.652,215.511C 432.769,215.395 
-              432.958,215.395 433.075,215.511L 446.736,229.173C 446.853,229.289 
-              446.853,229.479 446.736,229.595L 442.009,229.595L 442.009,240.438 Z" />
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="PreviousGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Brush="#00000000"
-                           Geometry="F1 M 8.47772,268.99L 
-              75.1444,268.99L 75.1444,335.657L 8.47772,335.657L 8.47772,268.99 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1"
-                   LineJoin="Round"
-                   Brush="Transparent" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 
-              57.2513,286.303L 57.2513,318.344L 26.3707,302.323L 57.2513,286.303 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1"
-                   LineJoin="Round"
-                   Brush="{StaticResource GlyphBrush}" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="NextGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Brush="#00000000"
-                           Geometry="F1 M 75.1444,415.886L 
-              8.47772,415.886L 8.47772,349.219L 75.1444,349.219L 75.1444,415.886 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1"
-                   LineJoin="Round"
-                   Brush="#00FFFFFF" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 26.3708,398.573L 26.3708,366.532L 57.2514,382.553L 
-              26.3708,398.573 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1"
-                   LineJoin="Round"
-                   Brush="{StaticResource GlyphBrush}" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="CloseXDrawingImage">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 470.57,422.952C 470.414,423.109 470.161,423.109 
-              470.005,422.952L 451.714,404.662C 451.558,404.506 451.558,404.252 
-              451.714,404.096L 489.144,366.667L 451.714,329.237C 451.558,329.081 
-              451.558,328.828 451.714,328.671L 470.005,310.381C 470.161,310.225 
-              470.414,310.225 470.57,310.381L 508,347.81L 545.43,310.381C 
-              545.586,310.225 545.839,310.225 545.995,310.381L 564.286,328.671C 
-              564.442,328.828 564.442,329.081 564.286,329.237L 526.856,366.667L 
-              564.286,404.096C 564.442,404.252 564.442,404.506 564.286,404.662L 
-              545.995,422.952C 545.839,423.109 545.586,423.109 545.43,422.952L 
-              508,385.523L 470.57,422.952 Z" />
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <Style x:Key="{x:Type local:Zoombox}"
-         TargetType="{x:Type local:Zoombox}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Foreground"
-            Value="Black" />
-    <Setter Property="PanDistance"
-            Value="5.0" />
-    <Setter Property="ZoomOrigin"
-            Value="0.5,0.5" />
-    <Setter Property="ZoomPercentage"
-            Value="5.0" />
-    <Setter Property="DragModifiers"
-            Value="Ctrl,Exact" />
-    <Setter Property="DragOnPreview"
-            Value="False" />
-    <Setter Property="ZoomModifiers"
-            Value="Shift,Exact" />
-    <Setter Property="ZoomOnPreview"
-            Value="True" />
-    <Setter Property="RelativeZoomModifiers"
-            Value="Ctrl,Alt,Exact" />
-    <Setter Property="ZoomToSelectionModifiers"
-            Value="Alt,Exact" />
-    <Setter Property="NavigateOnPreview"
-            Value="False" />
-    <Setter Property="ViewFinderVisibility"
-            Value="Collapsed" />
-    <Setter Property="MinScale"
-            Value="0.01" />
-    <Setter Property="MaxScale"
-            Value="100.0" />
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:Zoombox}">
-          <ControlTemplate.Resources>
-            <SolidColorBrush x:Key="SelectionBrush"
-                             Color="Transparent" />
-            <Pen x:Key="SelectionPen"
-                 Thickness="2.0"
-                 Brush="#7F3F3F3F" />
-            <Pen x:Key="ViewportPen"
-                 Thickness="1.0"
-                 Brush="Red" />
-            <InputBindingCollection x:Key="InputBindings">
-              <KeyBinding Command="local:Zoombox.ZoomOut"
-                          Key="Left"
-                          Modifiers="Control" />
-              <KeyBinding Command="local:Zoombox.ZoomOut"
-                          Key="Up"
-                          Modifiers="Control" />
-              <KeyBinding Command="local:Zoombox.ZoomIn"
-                          Key="Right"
-                          Modifiers="Control" />
-              <KeyBinding Command="local:Zoombox.ZoomIn"
-                          Key="Down"
-                          Modifiers="Control" />
-              <KeyBinding Command="local:Zoombox.PanLeft"
-                          Key="Left"
-                          Modifiers="Shift+Control" />
-              <KeyBinding Command="local:Zoombox.PanUp"
-                          Key="Up"
-                          Modifiers="Shift+Control" />
-              <KeyBinding Command="local:Zoombox.PanRight"
-                          Key="Right"
-                          Modifiers="Shift+Control" />
-              <KeyBinding Command="local:Zoombox.PanDown"
-                          Key="Down"
-                          Modifiers="Shift+Control" />
-              <KeyBinding Command="local:Zoombox.Forward"
-                          Key="BrowserForward" />
-              <KeyBinding Command="local:Zoombox.Back"
-                          Key="BrowserBack" />
-              <KeyBinding Command="local:Zoombox.Back"
-                          Key="Back" />
-            </InputBindingCollection>
-          </ControlTemplate.Resources>
-          <Grid Name="BackgroundGrid"
-                Background="{TemplateBinding Background}">
-
-            <Grid.RowDefinitions>
-              <RowDefinition Height="*" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <ContentPresenter x:Name="_contentPresenter"
-                              Grid.Row="0"
-                              Grid.Column="0" />
-            <ScrollBar x:Name="PART_VerticalScrollBar"
-                       Grid.Row="0"
-                       Grid.Column="1"
-                       Orientation="Vertical"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <ScrollBar x:Name="PART_HorizontalScrollBar"
-                       Grid.Row="1"
-                       Grid.Column="0"
-                       Orientation="Horizontal"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <Border Grid.Row="1"
-                    Grid.Column="1"
-                    Background="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
-
-            <Border Name="ViewFinder"
-                    RenderTransformOrigin="1,1"
-                    Background="#b0666666"
-                    BorderBrush="{TemplateBinding Foreground}"
-                    BorderThickness="2"
-                    Opacity="0"
-                    Width="200"
-                    Height="190"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Bottom"
-                    Margin="10"
-                    CornerRadius="0">
-              <Border.RenderTransform>
-                <TransformGroup>
-                  <ScaleTransform x:Name="LayoutScaleTransform"
-                                  ScaleX="0"
-                                  ScaleY="0" />
-                </TransformGroup>
-              </Border.RenderTransform>
-              <Grid Margin="4">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <StackPanel Orientation="Horizontal"
-                            Margin="0,0,0,3">
-                  <Button x:Name="BackButton"
-                          Command="local:Zoombox.Back"
-                          ToolTip="Go Back"
-                          Width="20px"
-                          Height="20px"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource PreviousGlyph}">
-                    </Image>
-                  </Button>
-                  <Button x:Name="ForwardButton"
-                          Command="local:Zoombox.Forward"
-                          ToolTip="Go Forward"
-                          Width="20px"
-                          Height="20px"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource NextGlyph}">
-                    </Image>
-                  </Button>
-                  <Button x:Name="HomeButton"
-                          Command="local:Zoombox.Home"
-                          ToolTip="Go Home"
-                          Width="20px"
-                          Height="20px"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource HomeGlyph}"
-                           Margin="2">
-                    </Image>
-                  </Button>
-                  <Button x:Name="FitButton"
-                          Command="local:Zoombox.Fit"
-                          ToolTip="Fit Content within Bounds"
-                          Width="20px"
-                          Height="20px"
-                          Margin="2,0"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource FitContentGlyph}"
-                           Margin="2" >
-                    </Image>
-                  </Button>
-                  <Button x:Name="FillButton"
-                          Command="local:Zoombox.Fill"
-                          ToolTip="Fill Bounds with Content"
-                          Width="20px"
-                          Height="20px"
-                          Margin="2,0"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource FillToBoundsGlyph}"
-                           Margin="2" >
-                    </Image>
-                  </Button>
-                  <Button x:Name="CenterButton"
-                          Command="local:Zoombox.Center"
-                          ToolTip="Center Content"
-                          Width="20px"
-                          Height="20px"
-                          Margin="2,0"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource CenterGlyph}"
-                           Margin="2" >
-                    </Image>
-                  </Button>
-                  <Button x:Name="RefocusButton"
-                          Command="local:Zoombox.Refocus"
-                          Visibility="Collapsed"
-                          ToolTip="Refocus View"
-                          Width="20px"
-                          Height="20px"
-                          Margin="2,0"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource RefocusGlyph}"
-                           Margin="2" >
-                    </Image>
-                  </Button>
-                </StackPanel>
-                <ToggleButton x:Name="ToggleViewFinderButton"
-                              ToolTip="Hide View Finder"
-                              Height="13"
-                              Width="13"
-                              Margin="0,2,0,0"
-                              HorizontalAlignment="Right"
-                              VerticalAlignment="Top"
-                              Style="{StaticResource TransparentButton}"
-                              Foreground="White"
-                              IsChecked="{Binding ElementName=ShowViewFinder, Path=IsChecked}">
-                  <Image Source="{StaticResource CloseXDrawingImage}"
-                         Margin="2" >
-                  </Image>
-                </ToggleButton>
-                <Border Grid.Row="1"
-                        BorderBrush="{StaticResource GlyphBrush}"
-                        BorderThickness="2"
-                        Background="#80FFFFFF" />
-                <local:ZoomboxViewFinderDisplay Grid.Row="1"
-                                                Name="ViewFinderDisplay"
-                                                ClipToBounds="True"
-                                                Background="#C0FFFFFF"
-                                                Margin="2"
-                                                ShadowBrush="#80FFFFFF"
-                                                ViewportBrush="Transparent"
-                                                ViewportPen="{StaticResource ViewportPen}" />
-              </Grid>
-            </Border>
-            <ToggleButton Name="ShowViewFinder"
-                          IsTabStop="False"
-                          ToolTip="Show View Finder"
-                          HorizontalAlignment="Right"
-                          VerticalAlignment="Bottom"
-                          Margin="5"
-                          Height="22"
-                          Width="22"
-                          FocusVisualStyle="{x:Null}"
-                          Style="{StaticResource ViewFinderToggleButtonStyle}"
-                          Foreground="Transparent"
-                          Background="Transparent"
-                          IsChecked="{Binding Path=ViewFinderVisibility, 
-                    Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent},
-                    Converter={StaticResource TrueIfVisibleConverter}}">
-              <Grid Name="ShowViewFinderGlyph"
-                    Opacity="0">
-                <Image x:Name="ShowViewFinderGlyphImage"
-                       Source="{StaticResource ShowViewFinderGlyph}">
-                </Image>
-              </Grid>
-            </ToggleButton>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="EffectiveViewStackMode"
-                     Value="Manual">
-              <Setter TargetName="RefocusButton"
-                      Property="Visibility"
-                      Value="Visible" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Trigger.EnterActions>
-                <BeginStoryboard>
-                  <Storyboard>
-                    <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                     Storyboard.TargetProperty="Opacity"
-                                     DecelerationRatio="1"
-                                     Duration="0:0:0.3"
-                                     From="0"
-                                     To="1"
-                                     FillBehavior="HoldEnd" />
-                  </Storyboard>
-                </BeginStoryboard>
-              </Trigger.EnterActions>
-              <Trigger.ExitActions>
-                <BeginStoryboard>
-                  <Storyboard>
-                    <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                     Storyboard.TargetProperty="Opacity"
-                                     DecelerationRatio="1"
-                                     Duration="0:0:0.3"
-                                     From="1"
-                                     To="0"
-                                     FillBehavior="HoldEnd" />
-                  </Storyboard>
-                </BeginStoryboard>
-              </Trigger.ExitActions>
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     Value="False"
-                     SourceName="ShowViewFinder">
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="BackButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="ForwardButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="HomeButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="FitButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="FillButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="CenterButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="ToggleViewFinderButton" />
-            </Trigger>
-            <Trigger Property="IsUsingScrollBars"
-                     Value="True">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_VerticalScrollBar" />
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_HorizontalScrollBar" />
-            </Trigger>
-            <EventTrigger RoutedEvent="ToggleButton.Checked"
-                          SourceName="ShowViewFinder">
-              <BeginStoryboard>
-                <Storyboard>
-                  <DoubleAnimation Storyboard.TargetName="ViewFinder"
-                                   Storyboard.TargetProperty="Opacity"
-                                   DecelerationRatio="1"
-                                   Duration="0:0:0.3"
-                                   From="0"
-                                   To="1"
-                                   FillBehavior="HoldEnd" />
-                  <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
-                                   Storyboard.TargetProperty="Opacity"
-                                   DecelerationRatio="1"
-                                   Duration="0:0:0.3"
-                                   From="1"
-                                   To="0"
-                                   FillBehavior="HoldEnd" />
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
-                                                 Storyboard.TargetName="LayoutScaleTransform"
-                                                 AccelerationRatio="1">
-                    <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5"
-                                          Value="1"
-                                          KeyTime="00:00:00.3" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
-                                                 Storyboard.TargetName="LayoutScaleTransform"
-                                                 AccelerationRatio="1">
-                    <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5"
-                                           Value="1"
-                                           KeyTime="00:00:00.3" />
-                  </DoubleAnimationUsingKeyFrames>
-                </Storyboard>
-              </BeginStoryboard>
-            </EventTrigger>
-            <EventTrigger RoutedEvent="ToggleButton.Unchecked"
-                          SourceName="ShowViewFinder">
-              <BeginStoryboard>
-                <Storyboard>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
-                                                 Storyboard.TargetName="LayoutScaleTransform"
-                                                 AccelerationRatio="1">
-                    <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5"
-                                          Value="0"
-                                          KeyTime="00:00:00.3" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
-                                                 Storyboard.TargetName="LayoutScaleTransform"
-                                                 AccelerationRatio="1">
-                    <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5"
-                                           Value="0"
-                                           KeyTime="00:00:00.3" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimation Storyboard.TargetName="ViewFinder"
-                                   Storyboard.TargetProperty="Opacity"
-                                   DecelerationRatio="1"
-                                   Duration="0:0:0.3"
-                                   From="1"
-                                   To="0"
-                                   FillBehavior="HoldEnd" />
-                  <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
-                                   Storyboard.TargetProperty="Opacity"
-                                   DecelerationRatio="1"
-                                   Duration="0:0:0.3"
-                                   From="0"
-                                   To="1"
-                                   FillBehavior="HoldEnd" />
-                </Storyboard>
-              </BeginStoryboard>
-            </EventTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <!-- NOTE:  Order matters!
-          These triggers should be ordered according to the KeyModifiers assigned to 
-          each operation. If one operation requires Ctrl and another requires 
-          Ctrl+Shift, the trigger for the operation requiring both modifier keys 
-          should appear *after* the trigger for the operation requiring only one. -->
-      <Trigger Property="AreDragModifiersActive"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="SizeAll" />
-      </Trigger>
-      <Trigger Property="AreZoomToSelectionModifiersActive"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="Cross" />
-      </Trigger>
-      <Trigger Property="AreZoomModifiersActive"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="{x:Static local:ZoomboxCursors.Zoom}" />
-      </Trigger>
-      <Trigger Property="AreRelativeZoomModifiersActive"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="{x:Static local:ZoomboxCursors.ZoomRelative}" />
-      </Trigger>
-      <!-- The IsDraggingContent and IsSelectingRegion triggers should 
-           always be last. -->
-      <Trigger Property="IsDraggingContent"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="SizeAll" />
-      </Trigger>
-      <Trigger Property="IsSelectingRegion"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="Cross" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
deleted file mode 100644
index fa053728..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
+++ /dev/null
@@ -1,833 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Zoombox"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-  <conv:RoundedValueConverter x:Key="RoundedValueConverter"
-                              Precision="2" />
-  <conv:VisibilityToBoolConverter x:Key="TrueIfVisibleConverter"
-                                  Inverted="False"
-                                  Not="False" />
-  <conv:VisibilityToBoolConverter x:Key="TrueIfNotVisibleConverter"
-                                  Inverted="False"
-                                  Not="True" />
-  <conv:VisibilityToBoolConverter x:Key="VisibleIfTrueConverter"
-                                  Inverted="True"
-                                  Not="False" />
-  <conv:VisibilityToBoolConverter x:Key="VisibleIfNotTrueConverter"
-                                  Inverted="True"
-                                  Not="True" />
-
-  <SolidColorBrush x:Key="GlyphBrush"
-                   Color="white" />
-
-  <Style x:Key="TransparentButton"
-         TargetType="{x:Type ButtonBase}"
-         BasedOn="{x:Null}">
-    <Setter Property="FocusVisualStyle"
-            Value="{x:Null}" />
-    <Setter Property="Background"
-            Value="#333333" />
-    <Setter Property="Foreground"
-            Value="#cccccc" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ButtonBase}">
-          <Grid Background="Transparent"
-                Cursor="Hand">
-            <Rectangle Fill="{TemplateBinding Background}"
-                       Stroke="{TemplateBinding Foreground}"
-                       RadiusX="3"
-                       RadiusY="3"
-                       x:Name="BackgroundTextBoxRectangle"
-                       Opacity="0" />
-            <ContentPresenter />
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Opacity"
-                      Value="0.4" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="BackgroundTextBoxRectangle"
-                      Property="Opacity"
-                      Value="1" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocusWithin"
-                     Value="True">
-              <Setter TargetName="BackgroundTextBoxRectangle"
-                      Property="Opacity"
-                      Value="1" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ViewFinderToggleButtonStyle"
-         BasedOn="{StaticResource TransparentButton}"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="Visibility"
-            Value="Visible" />
-    <Style.Triggers>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Zoombox}}, Path=ViewFinderVisibility}"
-                   Value="Hidden">
-        <Setter Property="Visibility"
-                Value="Collapsed" />
-      </DataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <DrawingImage x:Key="ShowViewFinderGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup>
-          <DrawingGroup.Transform>
-            <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,11.533,0.664" />
-          </DrawingGroup.Transform>
-          <GeometryDrawing Brush="#FF000000"
-                           Geometry="M8.823,9.895 
-              L12.440,13.460 10.784,15.092 15.347,15.092 15.347,15.125 
-              9.651,15.125 11.306,13.493 8.239,10.470 8.823,9.895 z 
-              M15.347,9.511 L15.347,10.595 14.842,11.093 14.292,10.551
-              15.347,9.511 z M0,9.481 L1.133,10.598 1.133,15.092 
-              5.694,15.092 5.727,15.125 0,15.125 0,9.481 z M14.842,3.963 
-              L15.347,4.461 15.347,5.611 14.258,4.538 14.842,3.963 z 
-              M2.793,3.952 L6.410,7.517 2.793,11.082 2.243,10.540 
-              5.276,7.551 2.209,4.527 2.793,3.952 z M9.653,0 L10.821,0 
-              12.429,1.585 8.812,5.150 8.262,4.608 11.296,1.618 9.653,0 z
-              M0,0 L1.133,0 1.133,4.504 0,5.621 0,0 z" />
-        </DrawingGroup>
-        <DrawingGroup>
-          <DrawingGroup.Transform>
-            <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.048,1.182" />
-          </DrawingGroup.Transform>
-          <GeometryDrawing Brush="#4B5F5F5F"
-                           Geometry="M0,0 L5.703,0 
-              4.061,1.618 7.678,5.183 11.295,1.618 9.653,0 15.347,0 15.347,5.611
-              13.704,3.996 10.091,7.561 13.708,11.126 15.347,9.511 15.347,15.125 
-              9.651,15.125 11.306,13.493 7.689,9.928 4.071,13.493 5.727,15.125 
-              0,15.125 0,9.480 1.659,11.115 5.276,7.551 1.659,3.986 0,5.621 0,0 z" />
-        </DrawingGroup>
-        <DrawingGroup>
-          <DrawingGroup.Transform>
-            <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.186,1.538" />
-          </DrawingGroup.Transform>
-          <GeometryDrawing Brush="#FFFFFFFF"
-                           Geometry="M6.867,9.820 L7.334,10.280 
-              4.072,13.494 5.727,15.126 0,15.126 0,15.016 4.906,15.016 3.250,13.384
-              6.867,9.820 z M15.347,9.512 L15.347,15.126 9.651,15.126 9.762,15.016
-              14.525,15.016 14.525,10.322 15.347,9.512 z M0,9.481 L1.193 ,10.657 
-              0.837,11.007 0,10.182 0,9.481 z M12.887,3.888 L13.353,4.347 
-              10.091,7.56 13.242,10.667 12.887,11.018 9.270,7.453 12.887,3.888 z
-              M0.837,3.878 L1.303,4.337 0,5.621 0,4.703 0.837,3.878 z M14.525,0 
-              L15.347,0 15.347,5.612 14.525,4.802 14.525,0 z M4.772,0 L5.703,0
-              4.061,1.617 7.212,4.724 6.857,5.075 3.239,1.511 4.772,0 z" />
-        </DrawingGroup>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="FillToBoundsGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Geometry="F1 M 218.138,210.145L 255.599,210.145L
-              255.599,246.628L 218.138,246.628L 218.138,210.145 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1.2"
-                   LineJoin="Round"
-                   Brush="{StaticResource GlyphBrush}" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 249.378,215.741L 249.378,215.743L 249.383,215.743L 
-              249.383,219.159L 249.378,219.159L 249.378,224.598L 245.962,224.598L 
-              245.962,219.159L 240.525,219.159L 240.525,215.743L 245.962,215.743L 
-              245.962,215.741L 249.378,215.741 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 249.383,240.726L 249.381,240.726L 249.381,240.73L 
-              245.965,240.73L 245.965,240.726L 240.526,240.726L 240.526,237.31L 
-              245.965,237.31L 245.965,231.873L 249.381,231.873L 249.381,237.31L 
-              249.383,237.31L 249.383,240.726 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 247.539,220.321L 239.801,228.059L 247.539,235.796L 
-              244.962,238.373L 237.224,230.635L 229.487,238.373L 226.91,235.796L 
-              234.648,228.059L 226.91,220.321L 229.487,217.744L 237.224,225.482L 
-              244.962,217.744L 247.539,220.321 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 224.879,240.73L 224.879,240.729L 224.874,240.729L 
-              224.874,237.312L 224.879,237.312L 224.879,231.873L 228.295,231.873L 
-              228.295,237.312L 233.732,237.312L 233.732,240.729L 228.295,240.729L 
-              228.295,240.73L 224.879,240.73 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 224.874,215.746L 224.876,215.746L 224.876,215.741L 
-              228.292,215.741L 228.292,215.746L 233.731,215.746L 233.731,219.162L 
-              228.292,219.162L 228.292,224.598L 224.876,224.598L 224.876,219.162L 
-              224.874,219.162L 224.874,215.746 Z" />
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="FitContentGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Geometry="F1 M 267.334,210.477L 304.795,210.477L 
-              304.795,246.96L 267.334,246.96L 267.334,210.477 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1.2"
-                   LineJoin="Round"
-                   Brush="{StaticResource GlyphBrush}" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 298.574,216.073L 298.574,216.075L 298.579,216.075L 
-              298.579,219.491L 298.574,219.491L 298.574,224.93L 295.158,224.93L 
-              295.158,219.491L 289.721,219.491L 289.721,216.075L 295.158,216.075L 
-              295.158,216.073L 298.574,216.073 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 298.579,241.058L 298.577,241.058L 298.577,241.062L 
-              295.161,241.062L 295.161,241.058L 289.722,241.058L 289.722,237.642L 
-              295.161,237.642L 295.161,232.205L 298.577,232.205L 298.577,237.642L 
-              298.579,237.642L 298.579,241.058 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 274.075,241.062L 274.075,241.061L 274.07,241.061L 
-              274.07,237.644L 274.075,237.644L 274.075,232.205L 277.491,232.205L 
-              277.491,237.644L 282.928,237.644L 282.928,241.061L 277.491,241.061L 
-              277.491,241.062L 274.075,241.062 Z" />
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 274.07,216.078L 274.072,216.078L 274.072,216.073L 
-              277.488,216.073L 277.488,216.078L 282.927,216.078L 282.927,219.494L 
-              277.488,219.494L 277.488,224.93L 274.072,224.93L 274.072,219.494L 
-              274.07,219.494L 274.07,216.078 Z" />
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="CenterGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Geometry="F1 M 315.334,209.944L 352.795,209.944L 
-              352.795,246.427L 315.334,246.427L 315.334,209.944 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1.2"
-                   LineJoin="Round"
-                   Brush="{StaticResource GlyphBrush}" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 328.878,223.652L 338.19,223.652C 338.27,223.652 
-              338.334,223.716 338.334,223.796L 338.334,233.108C 338.334,233.188 
-              338.27,233.252 338.19,233.252L 328.878,233.252C 328.799,233.252 
-              328.734,233.188 328.734,233.108L 328.734,223.796C 328.734,223.716 
-              328.799,223.652 328.878,223.652 Z" />
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="RefocusGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup>
-          <DrawingGroup.Transform>
-            <MatrixTransform Matrix="1,0,0,1,0.667,1.667" />
-          </DrawingGroup.Transform>
-          <GeometryDrawing Brush="#FFFFFFFF"
-                           Geometry="M6.624,0 C10.281,0 
-              13.247,2.836 13.247,6.334 13.247,7.176 13.075,7.980 12.734,8.703
-              L14.666,10.550 14.666,10.631 8.989,10.631 8.989,5.202 9.072,5.202
-              10.971,7.018 C11.095,6.810 11.116,6.573 11.116,6.331 11.116,3.959
-              9.104,2.034 6.622,2.034 4.139,2.034 2.127,3.959 2.127,6.331
-              2.127,8.575 3.925,10.417 6.224,10.552 L8.220,12.461 C7.712,12.602
-              7.176,12.667 6.624,12.667 2.966,12.667 0,9.831 0,6.334 0,2.836
-              2.966,0 6.624,0 z" />
-        </DrawingGroup>
-        <GeometryDrawing Brush="#00FFFFFF">
-          <GeometryDrawing.Geometry>
-            <RectangleGeometry RadiusX="0"
-                               RadiusY="0"
-                               Rect="0,0,16,16" />
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="HomeGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Geometry="F1 M 414.001,209.411L 451.462,209.411L 
-              451.462,245.893L 414.001,245.893L 414.001,209.411 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1.2"
-                   LineJoin="Round"
-                   Brush="transparent" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 442.009,240.438C 442.009,240.534 441.886,240.612 
-              441.735,240.612L 423.992,240.612C 423.841,240.612 423.718,240.534 
-              423.718,240.438L 423.718,229.595L 418.991,229.595C 418.874,229.479 
-              418.874,229.289 418.991,229.173L 432.652,215.511C 432.769,215.395 
-              432.958,215.395 433.075,215.511L 446.736,229.173C 446.853,229.289 
-              446.853,229.479 446.736,229.595L 442.009,229.595L 442.009,240.438 Z" />
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="PreviousGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Brush="#00000000"
-                           Geometry="F1 M 8.47772,268.99L 
-              75.1444,268.99L 75.1444,335.657L 8.47772,335.657L 8.47772,268.99 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1"
-                   LineJoin="Round"
-                   Brush="Transparent" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 
-              57.2513,286.303L 57.2513,318.344L 26.3707,302.323L 57.2513,286.303 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1"
-                   LineJoin="Round"
-                   Brush="{StaticResource GlyphBrush}" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="NextGlyph">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Brush="#00000000"
-                           Geometry="F1 M 75.1444,415.886L 
-              8.47772,415.886L 8.47772,349.219L 75.1444,349.219L 75.1444,415.886 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1"
-                   LineJoin="Round"
-                   Brush="#00FFFFFF" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 26.3708,398.573L 26.3708,366.532L 57.2514,382.553L 
-              26.3708,398.573 Z">
-            <GeometryDrawing.Pen>
-              <Pen Thickness="1"
-                   LineJoin="Round"
-                   Brush="{StaticResource GlyphBrush}" />
-            </GeometryDrawing.Pen>
-          </GeometryDrawing>
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <DrawingImage x:Key="CloseXDrawingImage">
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <DrawingGroup.Children>
-          <GeometryDrawing Brush="{StaticResource GlyphBrush}"
-                           Geometry="F1 M 470.57,422.952C 470.414,423.109 470.161,423.109 
-              470.005,422.952L 451.714,404.662C 451.558,404.506 451.558,404.252 
-              451.714,404.096L 489.144,366.667L 451.714,329.237C 451.558,329.081 
-              451.558,328.828 451.714,328.671L 470.005,310.381C 470.161,310.225 
-              470.414,310.225 470.57,310.381L 508,347.81L 545.43,310.381C 
-              545.586,310.225 545.839,310.225 545.995,310.381L 564.286,328.671C 
-              564.442,328.828 564.442,329.081 564.286,329.237L 526.856,366.667L 
-              564.286,404.096C 564.442,404.252 564.442,404.506 564.286,404.662L 
-              545.995,422.952C 545.839,423.109 545.586,423.109 545.43,422.952L 
-              508,385.523L 470.57,422.952 Z" />
-        </DrawingGroup.Children>
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
-  <Style x:Key="{x:Type local:Zoombox}"
-         TargetType="{x:Type local:Zoombox}">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Foreground"
-            Value="Black" />
-    <Setter Property="PanDistance"
-            Value="5.0" />
-    <Setter Property="ZoomOrigin"
-            Value="0.5,0.5" />
-    <Setter Property="ZoomPercentage"
-            Value="5.0" />
-    <Setter Property="DragModifiers"
-            Value="Ctrl,Exact" />
-    <Setter Property="DragOnPreview"
-            Value="False" />
-    <Setter Property="ZoomModifiers"
-            Value="Shift,Exact" />
-    <Setter Property="ZoomOnPreview"
-            Value="True" />
-    <Setter Property="RelativeZoomModifiers"
-            Value="Ctrl,Alt,Exact" />
-    <Setter Property="ZoomToSelectionModifiers"
-            Value="Alt,Exact" />
-    <Setter Property="NavigateOnPreview"
-            Value="False" />
-    <Setter Property="ViewFinderVisibility"
-            Value="Collapsed" />
-    <Setter Property="MinScale"
-            Value="0.01" />
-    <Setter Property="MaxScale"
-            Value="100.0" />
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:Zoombox}">
-          <ControlTemplate.Resources>
-            <SolidColorBrush x:Key="SelectionBrush"
-                             Color="Transparent" />
-            <Pen x:Key="SelectionPen"
-                 Thickness="2.0"
-                 Brush="#7F3F3F3F" />
-            <Pen x:Key="ViewportPen"
-                 Thickness="1.0"
-                 Brush="Red" />
-            <InputBindingCollection x:Key="InputBindings">
-              <KeyBinding Command="local:Zoombox.ZoomOut"
-                          Key="Left"
-                          Modifiers="Control" />
-              <KeyBinding Command="local:Zoombox.ZoomOut"
-                          Key="Up"
-                          Modifiers="Control" />
-              <KeyBinding Command="local:Zoombox.ZoomIn"
-                          Key="Right"
-                          Modifiers="Control" />
-              <KeyBinding Command="local:Zoombox.ZoomIn"
-                          Key="Down"
-                          Modifiers="Control" />
-              <KeyBinding Command="local:Zoombox.PanLeft"
-                          Key="Left"
-                          Modifiers="Shift+Control" />
-              <KeyBinding Command="local:Zoombox.PanUp"
-                          Key="Up"
-                          Modifiers="Shift+Control" />
-              <KeyBinding Command="local:Zoombox.PanRight"
-                          Key="Right"
-                          Modifiers="Shift+Control" />
-              <KeyBinding Command="local:Zoombox.PanDown"
-                          Key="Down"
-                          Modifiers="Shift+Control" />
-              <KeyBinding Command="local:Zoombox.Forward"
-                          Key="BrowserForward" />
-              <KeyBinding Command="local:Zoombox.Back"
-                          Key="BrowserBack" />
-              <KeyBinding Command="local:Zoombox.Back"
-                          Key="Back" />
-            </InputBindingCollection>
-          </ControlTemplate.Resources>
-          <Grid Name="BackgroundGrid"
-                Background="{TemplateBinding Background}">
-
-            <Grid.RowDefinitions>
-              <RowDefinition Height="*" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <ContentPresenter x:Name="_contentPresenter"
-                              Grid.Row="0"
-                              Grid.Column="0" />
-            <ScrollBar x:Name="PART_VerticalScrollBar"
-                       Grid.Row="0"
-                       Grid.Column="1"
-                       Orientation="Vertical"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <ScrollBar x:Name="PART_HorizontalScrollBar"
-                       Grid.Row="1"
-                       Grid.Column="0"
-                       Orientation="Horizontal"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <Border Grid.Row="1"
-                    Grid.Column="1"
-                    Background="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
-
-            <Border Name="ViewFinder"
-                    RenderTransformOrigin="1,1"
-                    Background="#b0666666"
-                    BorderBrush="{TemplateBinding Foreground}"
-                    BorderThickness="2"
-                    Opacity="0"
-                    Width="200"
-                    Height="190"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Bottom"
-                    Margin="10"
-                    CornerRadius="0">
-              <Border.RenderTransform>
-                <TransformGroup>
-                  <ScaleTransform x:Name="LayoutScaleTransform"
-                                  ScaleX="0"
-                                  ScaleY="0" />
-                </TransformGroup>
-              </Border.RenderTransform>
-              <Grid Margin="4">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <StackPanel Orientation="Horizontal"
-                            Margin="0,0,0,3">
-                  <Button x:Name="BackButton"
-                          Command="local:Zoombox.Back"
-                          ToolTip="Go Back"
-                          Width="20px"
-                          Height="20px"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource PreviousGlyph}">
-                    </Image>
-                  </Button>
-                  <Button x:Name="ForwardButton"
-                          Command="local:Zoombox.Forward"
-                          ToolTip="Go Forward"
-                          Width="20px"
-                          Height="20px"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource NextGlyph}">
-                    </Image>
-                  </Button>
-                  <Button x:Name="HomeButton"
-                          Command="local:Zoombox.Home"
-                          ToolTip="Go Home"
-                          Width="20px"
-                          Height="20px"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource HomeGlyph}"
-                           Margin="2">
-                    </Image>
-                  </Button>
-                  <Button x:Name="FitButton"
-                          Command="local:Zoombox.Fit"
-                          ToolTip="Fit Content within Bounds"
-                          Width="20px"
-                          Height="20px"
-                          Margin="2,0"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource FitContentGlyph}"
-                           Margin="2">
-                    </Image>
-                  </Button>
-                  <Button x:Name="FillButton"
-                          Command="local:Zoombox.Fill"
-                          ToolTip="Fill Bounds with Content"
-                          Width="20px"
-                          Height="20px"
-                          Margin="2,0"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource FillToBoundsGlyph}"
-                           Margin="2">
-                    </Image>
-                  </Button>
-                  <Button x:Name="CenterButton"
-                          Command="local:Zoombox.Center"
-                          ToolTip="Center Content"
-                          Width="20px"
-                          Height="20px"
-                          Margin="2,0"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource CenterGlyph}"
-                           Margin="2">
-                    </Image>
-                  </Button>
-                  <Button x:Name="RefocusButton"
-                          Command="local:Zoombox.Refocus"
-                          Visibility="Collapsed"
-                          ToolTip="Refocus View"
-                          Width="20px"
-                          Height="20px"
-                          Margin="2,0"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource RefocusGlyph}"
-                           Margin="2">
-                    </Image>
-                  </Button>
-                </StackPanel>
-                <ToggleButton x:Name="ToggleViewFinderButton"
-                              ToolTip="Hide View Finder"
-                              Height="13"
-                              Width="13"
-                              Margin="0,2,0,0"
-                              HorizontalAlignment="Right"
-                              VerticalAlignment="Top"
-                              Style="{StaticResource TransparentButton}"
-                              Foreground="White"
-                              IsChecked="{Binding ElementName=ShowViewFinder, Path=IsChecked}">
-                  <Image Source="{StaticResource CloseXDrawingImage}"
-                         Margin="2">
-                  </Image>
-                </ToggleButton>
-                <Border Grid.Row="1"
-                        BorderBrush="{StaticResource GlyphBrush}"
-                        BorderThickness="2"
-                        Background="#80FFFFFF" />
-                <local:ZoomboxViewFinderDisplay Grid.Row="1"
-                                                Name="ViewFinderDisplay"
-                                                ClipToBounds="True"
-                                                Background="#C0FFFFFF"
-                                                Margin="2"
-                                                ShadowBrush="#80FFFFFF"
-                                                ViewportBrush="Transparent"
-                                                ViewportPen="{StaticResource ViewportPen}" />
-              </Grid>
-            </Border>
-            <ToggleButton Name="ShowViewFinder"
-                          IsTabStop="False"
-                          ToolTip="Show View Finder"
-                          HorizontalAlignment="Right"
-                          VerticalAlignment="Bottom"
-                          Margin="5"
-                          Height="22"
-                          Width="22"
-                          FocusVisualStyle="{x:Null}"
-                          Style="{StaticResource ViewFinderToggleButtonStyle}"
-                          Foreground="Transparent"
-                          Background="Transparent"
-                          IsChecked="{Binding Path=ViewFinderVisibility, 
-                    Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent},
-                    Converter={StaticResource TrueIfVisibleConverter}}">
-              <Grid Name="ShowViewFinderGlyph"
-                    Opacity="0">
-                <Image x:Name="ShowViewFinderGlyphImage"
-                       Source="{StaticResource ShowViewFinderGlyph}">
-                </Image>
-              </Grid>
-            </ToggleButton>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="EffectiveViewStackMode"
-                     Value="Manual">
-              <Setter TargetName="RefocusButton"
-                      Property="Visibility"
-                      Value="Visible" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Trigger.EnterActions>
-                <BeginStoryboard>
-                  <Storyboard>
-                    <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                     Storyboard.TargetProperty="Opacity"
-                                     DecelerationRatio="1"
-                                     Duration="0:0:0.3"
-                                     From="0"
-                                     To="1"
-                                     FillBehavior="HoldEnd" />
-                  </Storyboard>
-                </BeginStoryboard>
-              </Trigger.EnterActions>
-              <Trigger.ExitActions>
-                <BeginStoryboard>
-                  <Storyboard>
-                    <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                     Storyboard.TargetProperty="Opacity"
-                                     DecelerationRatio="1"
-                                     Duration="0:0:0.3"
-                                     From="1"
-                                     To="0"
-                                     FillBehavior="HoldEnd" />
-                  </Storyboard>
-                </BeginStoryboard>
-              </Trigger.ExitActions>
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     Value="False"
-                     SourceName="ShowViewFinder">
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="BackButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="ForwardButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="HomeButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="FitButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="FillButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="CenterButton" />
-              <Setter Property="Focusable"
-                      Value="False"
-                      TargetName="ToggleViewFinderButton" />
-            </Trigger>
-            <Trigger Property="IsUsingScrollBars"
-                     Value="True">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_VerticalScrollBar" />
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_HorizontalScrollBar" />
-            </Trigger>
-            <EventTrigger RoutedEvent="ToggleButton.Checked"
-                          SourceName="ShowViewFinder">
-              <BeginStoryboard>
-                <Storyboard>
-                  <DoubleAnimation Storyboard.TargetName="ViewFinder"
-                                   Storyboard.TargetProperty="Opacity"
-                                   DecelerationRatio="1"
-                                   Duration="0:0:0.3"
-                                   From="0"
-                                   To="1"
-                                   FillBehavior="HoldEnd" />
-                  <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
-                                   Storyboard.TargetProperty="Opacity"
-                                   DecelerationRatio="1"
-                                   Duration="0:0:0.3"
-                                   From="1"
-                                   To="0"
-                                   FillBehavior="HoldEnd" />
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
-                                                 Storyboard.TargetName="LayoutScaleTransform"
-                                                 AccelerationRatio="1">
-                    <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5"
-                                          Value="1"
-                                          KeyTime="00:00:00.3" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
-                                                 Storyboard.TargetName="LayoutScaleTransform"
-                                                 AccelerationRatio="1">
-                    <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5"
-                                           Value="1"
-                                           KeyTime="00:00:00.3" />
-                  </DoubleAnimationUsingKeyFrames>
-                </Storyboard>
-              </BeginStoryboard>
-            </EventTrigger>
-            <EventTrigger RoutedEvent="ToggleButton.Unchecked"
-                          SourceName="ShowViewFinder">
-              <BeginStoryboard>
-                <Storyboard>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
-                                                 Storyboard.TargetName="LayoutScaleTransform"
-                                                 AccelerationRatio="1">
-                    <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5"
-                                          Value="0"
-                                          KeyTime="00:00:00.3" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
-                                                 Storyboard.TargetName="LayoutScaleTransform"
-                                                 AccelerationRatio="1">
-                    <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5"
-                                           Value="0"
-                                           KeyTime="00:00:00.3" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimation Storyboard.TargetName="ViewFinder"
-                                   Storyboard.TargetProperty="Opacity"
-                                   DecelerationRatio="1"
-                                   Duration="0:0:0.3"
-                                   From="1"
-                                   To="0"
-                                   FillBehavior="HoldEnd" />
-                  <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
-                                   Storyboard.TargetProperty="Opacity"
-                                   DecelerationRatio="1"
-                                   Duration="0:0:0.3"
-                                   From="0"
-                                   To="1"
-                                   FillBehavior="HoldEnd" />
-                </Storyboard>
-              </BeginStoryboard>
-            </EventTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <!-- NOTE:  Order matters!
-          These triggers should be ordered according to the KeyModifiers assigned to 
-          each operation. If one operation requires Ctrl and another requires 
-          Ctrl+Shift, the trigger for the operation requiring both modifier keys 
-          should appear *after* the trigger for the operation requiring only one. -->
-      <Trigger Property="AreDragModifiersActive"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="SizeAll" />
-      </Trigger>
-      <Trigger Property="AreZoomToSelectionModifiersActive"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="Cross" />
-      </Trigger>
-      <Trigger Property="AreZoomModifiersActive"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="{x:Static local:ZoomboxCursors.Zoom}" />
-      </Trigger>
-      <Trigger Property="AreRelativeZoomModifiersActive"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="{x:Static local:ZoomboxCursors.ZoomRelative}" />
-      </Trigger>
-      <!-- The IsDraggingContent and IsSelectingRegion triggers should 
-           always be last. -->
-      <Trigger Property="IsDraggingContent"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="SizeAll" />
-      </Trigger>
-      <Trigger Property="IsSelectingRegion"
-               Value="True">
-        <Setter Property="Cursor"
-                Value="Cross" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
deleted file mode 100644
index d3804e7d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
+++ /dev/null
@@ -1,4058 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Globalization;
-using System.Security;
-using System.Security.Permissions;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  [TemplatePart( Name = PART_VerticalScrollBar, Type = typeof( ScrollBar ) )]
-  [TemplatePart( Name = PART_HorizontalScrollBar, Type = typeof( ScrollBar ) )]
-  public sealed class Zoombox : ContentControl
-  {
-    private const string PART_VerticalScrollBar = "PART_VerticalScrollBar";
-    private const string PART_HorizontalScrollBar = "PART_HorizontalScrollBar";
-    private bool _isUpdatingVisualTree = false;
-
-    #region Constructors
-
-    static Zoombox()
-    {
-      Zoombox.DefaultStyleKeyProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( typeof( Zoombox ) ) );
-      Zoombox.ClipToBoundsProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( true ) );
-      Zoombox.FocusableProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( true ) );
-      Zoombox.HorizontalContentAlignmentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( HorizontalAlignment.Center, new PropertyChangedCallback( Zoombox.RefocusView ) ) );
-      Zoombox.VerticalContentAlignmentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( VerticalAlignment.Center, new PropertyChangedCallback( Zoombox.RefocusView ) ) );
-      Zoombox.ContentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceContentValue ) ) );
-    }
-
-    public Zoombox()
-      : base()
-    {
-      try
-      {
-        new UIPermission( PermissionState.Unrestricted ).Demand();
-        _cacheBits[ ( int )CacheBits.HasUIPermission ] = true;
-      }
-      catch( SecurityException )
-      {
-      }
-
-      this.InitCommands();
-
-      // use the LayoutUpdated event to keep the Viewport in sync
-      this.LayoutUpdated += new EventHandler( this.OnLayoutUpdated );
-      this.AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnSizeChanged ), true );
-
-      this.CoerceValue( Zoombox.ViewStackModeProperty );
-
-      this.Loaded += this.Zoombox_Loaded;
-    }
-
-    #endregion
-
-    #region AnimationAccelerationRatio Property
-
-    public static readonly DependencyProperty AnimationAccelerationRatioProperty =
-      DependencyProperty.Register( "AnimationAccelerationRatio", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0d ), 
-          new ValidateValueCallback( Zoombox.ValidateAccelerationRatio ) );
-
-    public double AnimationAccelerationRatio
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.AnimationAccelerationRatioProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AnimationAccelerationRatioProperty, value );
-      }
-    }
-
-    private static bool ValidateAccelerationRatio( object value )
-    {
-      double newValue = ( double )value;
-      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
-        throw new ArgumentException( ErrorMessages.GetMessage( "AnimationAccelerationRatioOOR" ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region AnimationDecelerationRatio Property
-
-    public static readonly DependencyProperty AnimationDecelerationRatioProperty =
-      DependencyProperty.Register( "AnimationDecelerationRatio", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0d ), 
-          new ValidateValueCallback( Zoombox.ValidateDecelerationRatio ) );
-
-    public double AnimationDecelerationRatio
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.AnimationDecelerationRatioProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AnimationDecelerationRatioProperty, value );
-      }
-    }
-
-    private static bool ValidateDecelerationRatio( object value )
-    {
-      double newValue = ( double )value;
-      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
-        throw new ArgumentException( ErrorMessages.GetMessage( "AnimationDecelerationRatioOOR" ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region AnimationDuration Property
-
-    public static readonly DependencyProperty AnimationDurationProperty =
-      DependencyProperty.Register( "AnimationDuration", typeof( Duration ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( new Duration( TimeSpan.FromMilliseconds( 300 ) ) ) );
-
-    public Duration AnimationDuration
-    {
-      get
-      {
-        return ( Duration )this.GetValue( Zoombox.AnimationDurationProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AnimationDurationProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region AreDragModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreDragModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreDragModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreDragModifiersActiveProperty = Zoombox.AreDragModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreDragModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreDragModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreDragModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreDragModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AreRelativeZoomModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreRelativeZoomModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreRelativeZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreRelativeZoomModifiersActiveProperty = Zoombox.AreRelativeZoomModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreRelativeZoomModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreRelativeZoomModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreRelativeZoomModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreRelativeZoomModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AreZoomModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreZoomModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreZoomModifiersActiveProperty = Zoombox.AreZoomModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreZoomModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreZoomModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreZoomModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreZoomModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AreZoomToSelectionModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreZoomToSelectionModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreZoomToSelectionModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreZoomToSelectionModifiersActiveProperty = Zoombox.AreZoomToSelectionModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreZoomToSelectionModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreZoomToSelectionModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreZoomToSelectionModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreZoomToSelectionModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AutoWrapContentWithViewbox Property
-
-    public static readonly DependencyProperty AutoWrapContentWithViewboxProperty =
-      DependencyProperty.Register( "AutoWrapContentWithViewbox", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true, 
-          new PropertyChangedCallback( Zoombox.OnAutoWrapContentWithViewboxChanged ) ) );
-
-    public bool AutoWrapContentWithViewbox
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AutoWrapContentWithViewboxProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AutoWrapContentWithViewboxProperty, value );
-      }
-    }
-
-    private static void OnAutoWrapContentWithViewboxChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      o.CoerceValue( Zoombox.ContentProperty );
-    }
-
-    private static object CoerceContentValue( DependencyObject d, object value )
-    {
-      return ( ( Zoombox )d ).CoerceContentValue( value );
-    }
-
-    private object CoerceContentValue( object value )
-    {
-      if( value != null && !( value is UIElement ) && !( ( bool )this.GetValue( DesignerProperties.IsInDesignModeProperty ) ) )
-        throw new InvalidContentException( ErrorMessages.GetMessage( "ZoomboxContentMustBeUIElement" ) );
-
-      object oldContent = _content;
-      if( value != _trueContent || ( this.IsContentWrapped != this.AutoWrapContentWithViewbox ) )
-      {
-        // check whether the content is currently wrapped and needs to be unwrapped
-        if( this.IsContentWrapped && _content is Viewbox && _content != _trueContent )
-        {
-          Viewbox viewbox = ( Viewbox )_content;
-
-          BindingOperations.ClearAllBindings( viewbox );
-          if( viewbox.Child is FrameworkElement )
-          {
-            ( viewbox.Child as FrameworkElement ).RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
-          }
-          ( viewbox as Viewbox ).Child = null;
-
-          this.RemoveLogicalChild( viewbox );
-        }
-
-        // make sure the view finder's visual brush is null
-        if( _viewFinderDisplay != null && _viewFinderDisplay.VisualBrush != null )
-        {
-          _viewFinderDisplay.VisualBrush.Visual = null;
-          _viewFinderDisplay.VisualBrush = null;
-        }
-
-        // update the cached content and true content values
-        _content = value as UIElement;
-        _trueContent = value as UIElement;
-
-        // if necessary, unparent the existing content
-        if( _contentPresenter != null && _contentPresenter.Content != null )
-        {
-          _contentPresenter.Content = null;
-        }
-
-        // if necessary, wrap the content
-        this.IsContentWrapped = false;
-        if( this.AutoWrapContentWithViewbox )
-        {
-          // create a viewbox and make it the logical child of the Zoombox
-          Viewbox viewbox = new Viewbox();
-          this.AddLogicalChild( viewbox );
-
-          // now set the new parent to be the viewbox
-          viewbox.Child = value as UIElement;
-          _content = viewbox;
-          viewbox.HorizontalAlignment = HorizontalAlignment.Left;
-          viewbox.VerticalAlignment = VerticalAlignment.Top;
-          this.IsContentWrapped = true;
-        }
-
-        if( ( _content is Viewbox ) && ( this.IsContentWrapped ) && ( _trueContent is FrameworkElement ) )
-        {
-          ( _trueContent as FrameworkElement ).AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
-        }
-
-        if( _contentPresenter != null )
-        {
-          _contentPresenter.Content = _content;
-        }
-
-        if( _viewFinderDisplay != null )
-        {
-          this.CreateVisualBrushForViewFinder( _content );
-        }
-        this.UpdateViewFinderDisplayContentBounds();
-      }
-
-      // if the content changes, we need to reset the flags used to first render and arrange the content
-      if( oldContent != _content
-          && this.HasArrangedContentPresenter
-          && this.HasRenderedFirstView )
-      {
-        this.HasArrangedContentPresenter = false;
-        this.HasRenderedFirstView = false;
-        this.RefocusViewOnFirstRender = true;
-        _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged );
-      }
-      return _content;
-    }
-
-    private UIElement _trueContent; //null
-
-    #endregion
-
-    #region CurrentView Property
-
-    private static readonly DependencyPropertyKey CurrentViewPropertyKey =
-      DependencyProperty.RegisterReadOnly( "CurrentView", typeof( ZoomboxView ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxView.Empty, 
-          new PropertyChangedCallback( Zoombox.OnCurrentViewChanged ) ) );
-
-    public static readonly DependencyProperty CurrentViewProperty = Zoombox.CurrentViewPropertyKey.DependencyProperty;
-
-    public ZoomboxView CurrentView
-    {
-      get
-      {
-        return ( ZoomboxView )this.GetValue( Zoombox.CurrentViewProperty );
-      }
-    }
-
-    private void SetCurrentView( ZoomboxView value )
-    {
-      this.SetValue( Zoombox.CurrentViewPropertyKey, value );
-    }
-
-    private static void OnCurrentViewChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      if( !zoombox.IsUpdatingView )
-      {
-        zoombox.ZoomTo( zoombox.CurrentView );
-      }
-      zoombox.RaiseEvent( new ZoomboxViewChangedEventArgs( e.OldValue as ZoomboxView, e.NewValue as ZoomboxView, zoombox._lastViewIndex, zoombox.CurrentViewIndex ) );
-    }
-
-    #endregion
-
-    #region CurrentViewIndex Property
-
-    private static readonly DependencyPropertyKey CurrentViewIndexPropertyKey =
-      DependencyProperty.RegisterReadOnly( "CurrentViewIndex", typeof( int ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( -1 ) );
-
-    public static readonly DependencyProperty CurrentViewIndexProperty = Zoombox.CurrentViewIndexPropertyKey.DependencyProperty;
-
-    public int CurrentViewIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( Zoombox.CurrentViewIndexProperty );
-      }
-    }
-
-    internal void SetCurrentViewIndex( int value )
-    {
-      this.SetValue( Zoombox.CurrentViewIndexPropertyKey, value );
-    }
-
-    #endregion
-
-    #region DragModifiers Property
-
-    public static readonly DependencyProperty DragModifiersProperty =
-      DependencyProperty.Register( "DragModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultDragModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection DragModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.DragModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.DragModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultDragModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Ctrl );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region DragOnPreview Property
-
-    public static readonly DependencyProperty DragOnPreviewProperty =
-      DependencyProperty.Register( "DragOnPreview", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public bool DragOnPreview
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.DragOnPreviewProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.DragOnPreviewProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EffectiveViewStackMode Property
-
-    private static readonly DependencyPropertyKey EffectiveViewStackModePropertyKey =
-      DependencyProperty.RegisterReadOnly( "EffectiveViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxViewStackMode.Auto ) );
-
-    public static readonly DependencyProperty EffectiveViewStackModeProperty = Zoombox.EffectiveViewStackModePropertyKey.DependencyProperty;
-
-    public ZoomboxViewStackMode EffectiveViewStackMode
-    {
-      get
-      {
-        return ( ZoomboxViewStackMode )this.GetValue( Zoombox.EffectiveViewStackModeProperty );
-      }
-    }
-
-    private void SetEffectiveViewStackMode( ZoomboxViewStackMode value )
-    {
-      this.SetValue( Zoombox.EffectiveViewStackModePropertyKey, value );
-    }
-
-    #endregion
-
-    #region HasBackStack Property
-
-    private static readonly DependencyPropertyKey HasBackStackPropertyKey =
-      DependencyProperty.RegisterReadOnly( "HasBackStack", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasBackStackProperty = Zoombox.HasBackStackPropertyKey.DependencyProperty;
-
-    public bool HasBackStack
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.HasBackStackProperty );
-      }
-    }
-
-    #endregion
-
-    #region HasForwardStack Property
-
-    private static readonly DependencyPropertyKey HasForwardStackPropertyKey =
-      DependencyProperty.RegisterReadOnly( "HasForwardStack", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasForwardStackProperty = Zoombox.HasForwardStackPropertyKey.DependencyProperty;
-
-    public bool HasForwardStack
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.HasForwardStackProperty );
-      }
-    }
-
-    #endregion
-
-    #region IsAnimated Property
-
-    public static readonly DependencyProperty IsAnimatedProperty =
-      DependencyProperty.Register( "IsAnimated", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true, 
-          ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceIsAnimatedValue ) ) );
-
-    public bool IsAnimated
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsAnimatedProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.IsAnimatedProperty, value );
-      }
-    }
-
-    private static object CoerceIsAnimatedValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      bool result = ( bool )value;
-      if( !zoombox.IsInitialized )
-      {
-        result = false;
-      }
-      return result;
-    }
-
-    #endregion
-
-    #region IsDraggingContent Property
-
-    private static readonly DependencyPropertyKey IsDraggingContentPropertyKey =
-      DependencyProperty.RegisterReadOnly( "IsDraggingContent", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsDraggingContentProperty = Zoombox.IsDraggingContentPropertyKey.DependencyProperty;
-
-    public bool IsDraggingContent
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsDraggingContentProperty );
-      }
-    }
-
-    private void SetIsDraggingContent( bool value )
-    {
-      this.SetValue( Zoombox.IsDraggingContentPropertyKey, value );
-    }
-
-    #endregion
-
-    #region IsSelectingRegion Property
-
-    private static readonly DependencyPropertyKey IsSelectingRegionPropertyKey =
-      DependencyProperty.RegisterReadOnly( "IsSelectingRegion", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsSelectingRegionProperty = Zoombox.IsSelectingRegionPropertyKey.DependencyProperty;
-
-    public bool IsSelectingRegion
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsSelectingRegionProperty );
-      }
-    }
-
-    private void SetIsSelectingRegion( bool value )
-    {
-      this.SetValue( Zoombox.IsSelectingRegionPropertyKey, value );
-    }
-
-    #endregion
-
-    #region IsUsingScrollBars Property
-
-    public static readonly DependencyProperty IsUsingScrollBarsProperty =
-      DependencyProperty.Register( "IsUsingScrollBars", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false, ( PropertyChangedCallback )null ) );
-
-    public bool IsUsingScrollBars
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsUsingScrollBarsProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.IsUsingScrollBarsProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region MaxScale Property
-
-    public static readonly DependencyProperty MaxScaleProperty =
-      DependencyProperty.Register( "MaxScale", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 100d, FrameworkPropertyMetadataOptions.AffectsMeasure,
-          new PropertyChangedCallback( Zoombox.OnMaxScaleChanged ), new CoerceValueCallback( Zoombox.CoerceMaxScaleValue ) ) );
-
-    public double MaxScale
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.MaxScaleProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.MaxScaleProperty, value );
-      }
-    }
-
-    private static void OnMaxScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      zoombox.CoerceValue( Zoombox.MinScaleProperty );
-      zoombox.CoerceValue( Zoombox.ScaleProperty );
-    }
-
-    private static object CoerceMaxScaleValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      double result = ( double )value;
-      if( result < zoombox.MinScale )
-      {
-        result = zoombox.MinScale;
-      }
-      return result;
-    }
-
-    #endregion
-
-    #region MinScale Property
-
-    public static readonly DependencyProperty MinScaleProperty =
-      DependencyProperty.Register( "MinScale", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0.01d, FrameworkPropertyMetadataOptions.AffectsMeasure,
-          new PropertyChangedCallback( Zoombox.OnMinScaleChanged ), new CoerceValueCallback( Zoombox.CoerceMinScaleValue ) ) );
-
-    public double MinScale
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.MinScaleProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.MinScaleProperty, value );
-      }
-    }
-
-    private static void OnMinScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      zoombox.CoerceValue( Zoombox.MinScaleProperty );
-      zoombox.CoerceValue( Zoombox.ScaleProperty );
-    }
-
-    private static object CoerceMinScaleValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      double result = ( double )value;
-      if( result > zoombox.MaxScale )
-      {
-        result = zoombox.MaxScale;
-      }
-      return result;
-    }
-
-    #endregion
-
-    #region NavigateOnPreview Property
-
-    public static readonly DependencyProperty NavigateOnPreviewProperty =
-      DependencyProperty.Register( "NavigateOnPreview", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public bool NavigateOnPreview
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.NavigateOnPreviewProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.NavigateOnPreviewProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region PanDistance Property
-
-    public static readonly DependencyProperty PanDistanceProperty =
-      DependencyProperty.Register( "PanDistance", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 5d ) );
-
-    public double PanDistance
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.PanDistanceProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.PanDistanceProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Position Property
-
-    public static readonly DependencyProperty PositionProperty =
-      DependencyProperty.Register( "Position", typeof( Point ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( PointHelper.Empty, new PropertyChangedCallback( Zoombox.OnPositionChanged ) ) );
-
-    public Point Position
-    {
-      get
-      {
-        return ( Point )this.GetValue( Zoombox.PositionProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.PositionProperty, value );
-      }
-    }
-
-    private static void OnPositionChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      if( !zoombox.IsUpdatingViewport )
-      {
-        Point newPosition = ( Point )e.NewValue;
-        double scale = zoombox.Scale;
-        if( scale > 0 )
-        {
-          zoombox.ZoomTo( new Point( -newPosition.X, -newPosition.Y ) );
-        }
-      }
-    }
-
-    #endregion
-
-    #region RelativeZoomModifiers Property
-
-    public static readonly DependencyProperty RelativeZoomModifiersProperty =
-      DependencyProperty.Register( "RelativeZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultRelativeZoomModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection RelativeZoomModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.RelativeZoomModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.RelativeZoomModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultRelativeZoomModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Ctrl );
-      result.Add( KeyModifier.Alt );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region Scale Property
-
-    public static readonly DependencyProperty ScaleProperty =
-      DependencyProperty.Register( "Scale", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( double.NaN, 
-          new PropertyChangedCallback( Zoombox.OnScaleChanged ), new CoerceValueCallback( Zoombox.CoerceScaleValue ) ) );
-
-    public double Scale
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.ScaleProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ScaleProperty, value );
-      }
-    }
-
-    private static void OnScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      if( !zoombox.IsUpdatingView )
-      {
-        double newScale = ( double )e.NewValue;
-        zoombox.ZoomTo( newScale );
-      }
-    }
-
-    private static object CoerceScaleValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      double result = ( double )value;
-
-      if( result < zoombox.MinScale )
-      {
-        result = zoombox.MinScale;
-      }
-
-      if( result > zoombox.MaxScale )
-      {
-        result = zoombox.MaxScale;
-      }
-
-      return result;
-    }
-
-    #endregion
-
-    #region ViewFinder Property
-
-    private static readonly DependencyPropertyKey ViewFinderPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ViewFinder", typeof( FrameworkElement ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( null, new PropertyChangedCallback( Zoombox.OnViewFinderChanged ) ) );
-
-    public static readonly DependencyProperty ViewFinderProperty = Zoombox.ViewFinderPropertyKey.DependencyProperty;
-
-    public FrameworkElement ViewFinder
-    {
-      get
-      {
-        return ( FrameworkElement )this.GetValue( Zoombox.ViewFinderProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ViewFinderPropertyKey, value );
-      }
-    }
-
-    private static void OnViewFinderChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewFinderChanged( e );
-    }
-
-    private void OnViewFinderChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.AttachToVisualTree();
-    }
-
-    #endregion
-
-    #region ViewFinderVisibility Attached Property
-
-    public static readonly DependencyProperty ViewFinderVisibilityProperty =
-      DependencyProperty.RegisterAttached( "ViewFinderVisibility", typeof( Visibility ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Visibility.Visible ) );
-
-    public static Visibility GetViewFinderVisibility( DependencyObject d )
-    {
-      return ( Visibility )( d.GetValue( Zoombox.ViewFinderVisibilityProperty ) );
-    }
-
-    public static void SetViewFinderVisibility( DependencyObject d, Visibility value )
-    {
-      d.SetValue( Zoombox.ViewFinderVisibilityProperty, value );
-    }
-
-    #endregion
-
-    #region Viewport Property
-
-    private static readonly DependencyPropertyKey ViewportPropertyKey =
-      DependencyProperty.RegisterReadOnly( "Viewport", typeof( Rect ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Rect.Empty, 
-          new PropertyChangedCallback( Zoombox.OnViewportChanged ) ) );
-
-    public static readonly DependencyProperty ViewportProperty = Zoombox.ViewportPropertyKey.DependencyProperty;
-
-    public Rect Viewport
-    {
-      get
-      {
-        return ( Rect )this.GetValue( Zoombox.ViewportProperty );
-      }
-    }
-
-    private static void OnViewportChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      // keep the Position property in sync with the Viewport
-      Zoombox zoombox = ( Zoombox )o;
-      zoombox.Position = new Point( -zoombox.Viewport.Left * zoombox.Scale / zoombox._viewboxFactor, -zoombox.Viewport.Top * zoombox.Scale / zoombox._viewboxFactor );
-    }
-
-    #endregion
-
-    #region ViewStackCount Property
-
-    private static readonly DependencyPropertyKey ViewStackCountPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ViewStackCount", typeof( int ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( -1,
-          new PropertyChangedCallback( Zoombox.OnViewStackCountChanged ) ) );
-
-    public static readonly DependencyProperty ViewStackCountProperty = Zoombox.ViewStackCountPropertyKey.DependencyProperty;
-
-    public int ViewStackCount
-    {
-      get
-      {
-        return ( int )this.GetValue( Zoombox.ViewStackCountProperty );
-      }
-    }
-
-    internal void SetViewStackCount( int value )
-    {
-      this.SetValue( Zoombox.ViewStackCountPropertyKey, value );
-    }
-
-    private static void OnViewStackCountChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewStackCountChanged( e );
-    }
-
-    private void OnViewStackCountChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      this.UpdateStackProperties();
-    }
-
-    #endregion
-
-    #region ViewStackIndex Property
-
-    public static readonly DependencyProperty ViewStackIndexProperty =
-      DependencyProperty.Register( "ViewStackIndex", typeof( int ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( -1,
-          new PropertyChangedCallback( Zoombox.OnViewStackIndexChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackIndexValue ) ) );
-
-    public int ViewStackIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( Zoombox.ViewStackIndexProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ViewStackIndexProperty, value );
-      }
-    }
-
-    private static void OnViewStackIndexChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewStackIndexChanged( e );
-    }
-
-    private void OnViewStackIndexChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( !this.IsUpdatingView )
-      {
-        int viewIndex = this.ViewStackIndex;
-        if( viewIndex >= 0 && viewIndex < ViewStack.Count )
-        {
-          // update the current view, but don't allow the new view 
-          // to be added to the view stack
-          this.UpdateView( this.ViewStack[ viewIndex ], true, false, viewIndex );
-        }
-      }
-
-      this.UpdateStackProperties();
-      this.RaiseEvent( new IndexChangedEventArgs( Zoombox.ViewStackIndexChangedEvent, ( int )e.OldValue, ( int )e.NewValue ) );
-    }
-
-    private static object CoerceViewStackIndexValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = d as Zoombox;
-      return ( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled ) ? -1 : value;
-    }
-
-    #endregion
-
-    #region ViewStackMode Property
-
-    public static readonly DependencyProperty ViewStackModeProperty = 
-      DependencyProperty.Register( "ViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxViewStackMode.Default,
-          new PropertyChangedCallback( Zoombox.OnViewStackModeChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackModeValue ) ) );
-
-    public ZoomboxViewStackMode ViewStackMode
-    {
-      get
-      {
-        return ( ZoomboxViewStackMode )this.GetValue( Zoombox.ViewStackModeProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ViewStackModeProperty, value );
-      }
-    }
-
-    private static void OnViewStackModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewStackModeChanged( e );
-    }
-
-    private void OnViewStackModeChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( ( ZoomboxViewStackMode )e.NewValue == ZoomboxViewStackMode.Disabled && _viewStack != null )
-      {
-        _viewStack.ClearViewStackSource();
-        _viewStack = null;
-      }
-    }
-
-    private static object CoerceViewStackModeValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = d as Zoombox;
-      ZoomboxViewStackMode effectiveMode = ( ZoomboxViewStackMode )value;
-
-      // if the effective mode is currently disabled, it must be updated first
-      if( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-      {
-        zoombox.SetEffectiveViewStackMode( effectiveMode );
-      }
-
-      // now determine the correct effective mode
-      if( effectiveMode != ZoomboxViewStackMode.Disabled )
-      {
-        if( effectiveMode == ZoomboxViewStackMode.Default )
-        {
-          effectiveMode = ( zoombox.ViewStack.AreViewsFromSource ? ZoomboxViewStackMode.Manual : ZoomboxViewStackMode.Auto );
-        }
-        if( zoombox.ViewStack.AreViewsFromSource && ( ZoomboxViewStackMode )effectiveMode != ZoomboxViewStackMode.Manual )
-        {
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "ViewModeInvalidForSource" ) );
-        }
-      }
-
-      // update the effective mode
-      zoombox.SetEffectiveViewStackMode( effectiveMode );
-      return value;
-    }
-
-    #endregion
-
-    #region ViewStackSource Property
-
-    public static readonly DependencyProperty ViewStackSourceProperty =
-      DependencyProperty.Register( "ViewStackSource", typeof( IEnumerable ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ( IEnumerable )null,
-          new PropertyChangedCallback( Zoombox.OnViewStackSourceChanged ) ) );
-
-    [Bindable( true )]
-    public IEnumerable ViewStackSource
-    {
-      get
-      {
-        return ( _viewStack == null ) ? null : ViewStack.Source;
-      }
-      set
-      {
-        if( value == null )
-        {
-          this.ClearValue( Zoombox.ViewStackSourceProperty );
-        }
-        else
-        {
-          this.SetValue( Zoombox.ViewStackSourceProperty, value );
-        }
-      }
-    }
-
-    private static void OnViewStackSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      IEnumerable oldValue = ( IEnumerable )e.OldValue;
-      IEnumerable newValue = ( IEnumerable )e.NewValue;
-
-      // We need to know whether the new value represents an explicit null value 
-      // or whether it came from a binding. The latter indicates that we stay in ViewStackSource mode,
-      // but with a null collection.
-      if( e.NewValue == null && !BindingOperations.IsDataBound( d, Zoombox.ViewStackSourceProperty ) )
-      {
-        if( zoombox.ViewStack != null )
-        {
-          zoombox.ViewStack.ClearViewStackSource();
-        }
-      }
-      else
-      {
-        zoombox.ViewStack.SetViewStackSource( newValue );
-      }
-
-      zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
-    }
-
-    #endregion
-
-    #region ZoomModifiers Property
-
-    public static readonly DependencyProperty ZoomModifiersProperty =
-      DependencyProperty.Register( "ZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultZoomModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection ZoomModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.ZoomModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultZoomModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Shift );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region ZoomOnPreview Property
-
-    public static readonly DependencyProperty ZoomOnPreviewProperty =
-      DependencyProperty.Register( "ZoomOnPreview", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true ) );
-
-    public bool ZoomOnPreview
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.ZoomOnPreviewProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomOnPreviewProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomOrigin Property
-
-    public static readonly DependencyProperty ZoomOriginProperty =
-      DependencyProperty.Register( "ZoomOrigin", typeof( Point ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( new Point( 0.5d, 0.5d ) ) );
-
-    public Point ZoomOrigin
-    {
-      get
-      {
-        return ( Point )this.GetValue( Zoombox.ZoomOriginProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomOriginProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomPercentage Property
-
-    public static readonly DependencyProperty ZoomPercentageProperty =
-      DependencyProperty.Register( "ZoomPercentage", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 5d ) );
-
-    public double ZoomPercentage
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.ZoomPercentageProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomPercentageProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomOn Property
-
-    public static readonly DependencyProperty ZoomOnProperty =
-      DependencyProperty.Register( "ZoomOn", typeof( ZoomboxZoomOn ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxZoomOn.Content ) );
-
-    public ZoomboxZoomOn ZoomOn
-    {
-      get
-      {
-        return ( ZoomboxZoomOn )this.GetValue( Zoombox.ZoomOnProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomOnProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomToSelectionModifiers Property
-
-    public static readonly DependencyProperty ZoomToSelectionModifiersProperty =
-      DependencyProperty.Register( "ZoomToSelectionModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultZoomToSelectionModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection ZoomToSelectionModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.ZoomToSelectionModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomToSelectionModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultZoomToSelectionModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Alt );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region KeepContentInBounds Property
-
-    public static readonly DependencyProperty KeepContentInBoundsProperty =
-      DependencyProperty.Register( "KeepContentInBounds", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false, 
-          new PropertyChangedCallback( Zoombox.OnKeepContentInBoundsChanged ) ) );
-
-    public bool KeepContentInBounds
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.KeepContentInBoundsProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.KeepContentInBoundsProperty, value );
-      }
-    }
-
-    private static void OnKeepContentInBoundsChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnKeepContentInBoundsChanged( e );
-    }
-
-    private void OnKeepContentInBoundsChanged( DependencyPropertyChangedEventArgs e )
-    {
-      //
-      // Update view and see if we need to reposition the content
-      //
-      bool oldIsAnimated = this.IsAnimated;
-      this.IsAnimated = false;
-      try
-      {
-        this.UpdateView( this.CurrentView, false, false, this.ViewStackIndex );
-      }
-      finally
-      {
-        this.IsAnimated = oldIsAnimated;
-      }
-    }
-
-    #endregion
-
-    #region ViewStack Property
-
-    public ZoomboxViewStack ViewStack
-    {
-      get
-      {
-        if( _viewStack == null && this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-        {
-          _viewStack = new ZoomboxViewStack( this );
-        }
-        return _viewStack;
-      }
-    }
-
-    #endregion
-
-    #region HasArrangedContentPresenter Internal Property
-
-    internal bool HasArrangedContentPresenter
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasArrangedContentPresenter ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.HasArrangedContentPresenter ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingView Internal Property
-
-    internal bool IsUpdatingView
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingView ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingView ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ContentOffset Private Property
-
-    private Vector ContentOffset
-    {
-      get
-      {
-        // auto-wrapped content is always left and top aligned
-        if( this.IsContentWrapped || _content == null || !( _content is FrameworkElement ) )
-          return new Vector( 0, 0 );
-
-        double x = 0;
-        double y = 0;
-        Size contentSize = this.ContentRect.Size;
-
-        switch( ( _content as FrameworkElement ).HorizontalAlignment )
-        {
-          case HorizontalAlignment.Center:
-          case HorizontalAlignment.Stretch:
-            x = ( this.RenderSize.Width - contentSize.Width ) / 2;
-            break;
-
-          case HorizontalAlignment.Right:
-            x = this.RenderSize.Width - contentSize.Width;
-            break;
-        }
-
-        switch( ( _content as FrameworkElement ).VerticalAlignment )
-        {
-          case VerticalAlignment.Center:
-          case VerticalAlignment.Stretch:
-            y = ( this.RenderSize.Height - contentSize.Height ) / 2;
-            break;
-
-          case VerticalAlignment.Bottom:
-            y = this.RenderSize.Height - contentSize.Height;
-            break;
-        }
-
-        return new Vector( x, y );
-      }
-    }
-
-    #endregion
-
-    #region ContentRect Private Property
-
-    private Rect ContentRect
-    {
-      get
-      {
-        return ( _content == null ) ? Rect.Empty
-            : new Rect( new Size( _content.RenderSize.Width / _viewboxFactor, _content.RenderSize.Height / _viewboxFactor ) );
-      }
-    }
-
-    #endregion
-
-    #region HasRenderedFirstView Private Property
-
-    private bool HasRenderedFirstView
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasRenderedFirstView ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.HasRenderedFirstView ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasUIPermission Private Property
-
-    private bool HasUIPermission
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasUIPermission ];
-      }
-    }
-
-    #endregion
-
-    #region IsContentWrapped Private Property
-
-    private bool IsContentWrapped
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsContentWrapped ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsContentWrapped ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsDraggingViewport Private Property
-
-    private bool IsDraggingViewport
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsDraggingViewport ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsDraggingViewport ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsMonitoringInput Private Property
-
-    private bool IsMonitoringInput
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsMonitoringInput ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsMonitoringInput ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsResizingViewport Private Property
-
-    private bool IsResizingViewport
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsResizingViewport ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsResizingViewport ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingViewport Private Property
-
-    private bool IsUpdatingViewport
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingViewport ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingViewport ] = value;
-      }
-    }
-
-    #endregion
-
-    #region RefocusViewOnFirstRender Private Property
-
-    private bool RefocusViewOnFirstRender
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.RefocusViewOnFirstRender ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.RefocusViewOnFirstRender ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ViewFinderDisplayRect Private Property
-
-    private Rect ViewFinderDisplayRect
-    {
-      get
-      {
-        return ( _viewFinderDisplay == null ) ? Rect.Empty
-            : new Rect( new Point( 0, 0 ), new Point( _viewFinderDisplay.RenderSize.Width, _viewFinderDisplay.RenderSize.Height ) );
-      }
-    }
-
-    #endregion
-
-    #region AnimationBeginning Event
-
-    public static readonly RoutedEvent AnimationBeginningEvent = EventManager.RegisterRoutedEvent( "AnimationBeginning", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
-
-    public event RoutedEventHandler AnimationBeginning
-    {
-      add
-      {
-        this.AddHandler( Zoombox.AnimationBeginningEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.AnimationBeginningEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region AnimationCompleted Event
-
-    public static readonly RoutedEvent AnimationCompletedEvent = EventManager.RegisterRoutedEvent( "AnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
-
-    public event RoutedEventHandler AnimationCompleted
-    {
-      add
-      {
-        this.AddHandler( Zoombox.AnimationCompletedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.AnimationCompletedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region CurrentViewChanged Event
-
-    public static readonly RoutedEvent CurrentViewChangedEvent = EventManager.RegisterRoutedEvent( "CurrentViewChanged", RoutingStrategy.Bubble, typeof( ZoomboxViewChangedEventHandler ), typeof( Zoombox ) );
-
-    public event ZoomboxViewChangedEventHandler CurrentViewChanged
-    {
-      add
-      {
-        this.AddHandler( Zoombox.CurrentViewChangedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.CurrentViewChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    public event EventHandler<ScrollEventArgs> Scroll;
-
-    #region ViewStackIndexChanged Event
-
-    public static readonly RoutedEvent ViewStackIndexChangedEvent = EventManager.RegisterRoutedEvent( "ViewStackIndexChanged", RoutingStrategy.Bubble, typeof( IndexChangedEventHandler ), typeof( Zoombox ) );
-
-    public event IndexChangedEventHandler ViewStackIndexChanged
-    {
-      add
-      {
-        this.AddHandler( Zoombox.ViewStackIndexChangedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.ViewStackIndexChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region Back Command
-
-    public static RoutedUICommand Back = new RoutedUICommand( "Go Back", "GoBack", typeof( Zoombox ) );
-
-    private void CanGoBack( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-                  && ( this.ViewStackIndex > 0 );
-    }
-
-    private void GoBack( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.GoBack();
-    }
-
-    #endregion
-
-    #region Center Command
-
-    public static RoutedUICommand Center = new RoutedUICommand( "Center Content", "Center", typeof( Zoombox ) );
-
-    private void CenterContent( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.CenterContent();
-    }
-
-    #endregion
-
-    #region Fill Command
-
-    public static RoutedUICommand Fill = new RoutedUICommand( "Fill Bounds with Content", "FillToBounds", typeof( Zoombox ) );
-
-    private void FillToBounds( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.FillToBounds();
-    }
-
-    #endregion
-
-    #region Fit Command
-
-    public static RoutedUICommand Fit = new RoutedUICommand( "Fit Content within Bounds", "FitToBounds", typeof( Zoombox ) );
-
-    private void FitToBounds( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.FitToBounds();
-    }
-
-    #endregion
-
-    #region Forward Command
-
-    public static RoutedUICommand Forward = new RoutedUICommand( "Go Forward", "GoForward", typeof( Zoombox ) );
-
-    private void CanGoForward( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-                  && ( this.ViewStackIndex < this.ViewStack.Count - 1 );
-    }
-
-    private void GoForward( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.GoForward();
-    }
-
-    #endregion
-
-    #region Home Command
-
-    public static RoutedUICommand Home = new RoutedUICommand( "Go Home", "GoHome", typeof( Zoombox ) );
-
-    private void CanGoHome( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-                  && ( this.ViewStack.Count > 0 )
-                  && ( this.ViewStackIndex != 0 );
-    }
-
-    private void GoHome( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.GoHome();
-    }
-
-    #endregion
-
-    #region PanDown Command
-
-    public static RoutedUICommand PanDown = new RoutedUICommand( "Pan Down", "PanDown", typeof( Zoombox ) );
-
-    private void PanDownExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X, _basePosition.Y + PanDistance );
-    }
-
-    #endregion
-
-    #region PanLeft Command
-
-    public static RoutedUICommand PanLeft = new RoutedUICommand( "Pan Left", "PanLeft", typeof( Zoombox ) );
-
-    private void PanLeftExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X - this.PanDistance, _basePosition.Y );
-    }
-
-    #endregion
-
-    #region PanRight Command
-
-    public static RoutedUICommand PanRight = new RoutedUICommand( "Pan Right", "PanRight", typeof( Zoombox ) );
-
-    private void PanRightExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X + this.PanDistance, _basePosition.Y );
-    }
-
-    #endregion
-
-    #region PanUp Command
-
-    public static RoutedUICommand PanUp = new RoutedUICommand( "Pan Up", "PanUp", typeof( Zoombox ) );
-
-    private void PanUpExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X, _basePosition.Y - this.PanDistance );
-    }
-
-    #endregion
-
-    #region Refocus Command
-
-    public static RoutedUICommand Refocus = new RoutedUICommand( "Refocus View", "Refocus", typeof( Zoombox ) );
-
-    private void CanRefocusView( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode == ZoomboxViewStackMode.Manual )
-                  && ( this.ViewStackIndex >= 0 && this.ViewStackIndex < this.ViewStack.Count )
-                  && ( this.CurrentView != this.ViewStack[ this.ViewStackIndex ] );
-    }
-
-    private void RefocusView( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.RefocusView();
-    }
-
-    #endregion
-
-    #region ZoomIn Command
-
-    public static RoutedUICommand ZoomIn = new RoutedUICommand( "Zoom In", "ZoomIn", typeof( Zoombox ) );
-
-    private void ZoomInExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Zoom( this.ZoomPercentage / 100 );
-    }
-
-    #endregion
-
-    #region ZoomOut Command
-
-    public static RoutedUICommand ZoomOut = new RoutedUICommand( "Zoom Out", "ZoomOut", typeof( Zoombox ) );
-
-    private void ZoomOutExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Zoom( -this.ZoomPercentage / 100 );
-    }
-
-    #endregion
-
-    public void CenterContent()
-    {
-      if( _content != null )
-      {
-        this.SetScrollBars();
-        this.ZoomTo( ZoomboxView.Center );
-      }
-    }
-
-    public void FillToBounds()
-    {
-      if( _content != null )
-      {
-        this.SetScrollBars();
-        this.ZoomTo( ZoomboxView.Fill );
-      }
-    }
-
-    public void FitToBounds()
-    {
-      if( _content != null )
-      {
-        this.SetScrollBars();
-        this.ZoomTo( ZoomboxView.Fit );
-      }
-    }
-
-    public void GoBack()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex > 0 )
-      {
-        this.ViewStackIndex--;
-      }
-    }
-
-    public void GoForward()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex < this.ViewStack.Count - 1 )
-      {
-        this.ViewStackIndex++;
-      }
-    }
-
-    public void GoHome()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex > 0 )
-      {
-        this.ViewStackIndex = 0;
-      }
-    }
-
-    public override void OnApplyTemplate()
-    {
-      this.AttachToVisualTree();
-      base.OnApplyTemplate();
-    }
-
-    public void RefocusView()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex >= 0 && this.ViewStackIndex < this.ViewStack.Count
-          && this.CurrentView != this.ViewStack[ this.ViewStackIndex ] )
-      {
-        this.UpdateView( this.ViewStack[ this.ViewStackIndex ], true, false, this.ViewStackIndex );
-      }
-    }
-
-    public void Zoom( double percentage )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      this.Zoom( percentage, this.GetZoomRelativePoint() );
-    }
-
-    public void Zoom( double percentage, Point relativeTo )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      // adjust the current scale relative to the given point
-      double scale = this.Scale * ( 1 + percentage );
-      this.ZoomTo( scale, relativeTo );
-    }
-
-    public void ZoomTo( Point position )
-    {
-      // if there is nothing to pan, just return
-      if( _content == null )
-        return;
-
-      // zoom to the new region
-      this.ZoomTo( new ZoomboxView( new Point( -position.X, -position.Y ) ) );
-    }
-
-    public void ZoomTo( Rect region )
-    {
-      if( _content == null )
-        return;
-
-      // adjust the current scale and position
-      this.UpdateView( new ZoomboxView( region ), true, true );
-    }
-
-    public void ZoomTo( double scale )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      // adjust the current scale relative to the center of the content within the control
-      this.ZoomTo( scale, true );
-    }
-
-    public void ZoomTo( double scale, Point relativeTo )
-    {
-      this.ZoomTo( scale, relativeTo, true, true );
-    }
-
-    public void ZoomTo( ZoomboxView view )
-    {
-      this.UpdateView( view, true, true );
-    }
-
-    internal void UpdateStackProperties()
-    {
-      this.SetValue( Zoombox.HasBackStackPropertyKey, this.ViewStackIndex > 0 );
-      this.SetValue( Zoombox.HasForwardStackPropertyKey, this.ViewStack.Count > this.ViewStackIndex + 1 );
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      if( _content != null )
-      {
-        // measure visuals according to supplied constraint
-        Size size = base.MeasureOverride( constraint );
-
-        // now re-measure content to let the child be whatever size it desires
-        _content.Measure( new Size( double.PositiveInfinity, double.PositiveInfinity ) );
-        return size;
-      }
-
-
-      // avoid returning infinity
-      if( double.IsInfinity( constraint.Height ) )
-      {
-        constraint.Height = 0;
-      }
-
-      if( double.IsInfinity( constraint.Width ) )
-      {
-        constraint.Width = 0;
-      }
-      return constraint;
-    }
-
-    protected override void OnContentChanged( object oldContent, object newContent )
-    {
-      // disconnect SizeChanged handler from old content
-      if( oldContent is FrameworkElement )
-      {
-        ( oldContent as FrameworkElement ).RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
-      }
-      else
-      {
-        this.RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
-      }
-
-      // connect SizeChanged handler to new content
-      if( _content is FrameworkElement )
-      {
-        ( _content as FrameworkElement ).AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
-      }
-      else
-      {
-        this.AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
-      }
-
-      // update the Visual property of the view finder display panel's VisualBrush
-      if( _viewFinderDisplay != null && _viewFinderDisplay.VisualBrush != null )
-      {
-        _viewFinderDisplay.VisualBrush.Visual = _content;
-      }
-    }
-
-    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      this.MonitorInput();
-      base.OnGotKeyboardFocus( e );
-    }
-
-    protected override void OnLostKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      this.MonitorInput();
-      base.OnLostKeyboardFocus( e );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-      this.CoerceValue( Zoombox.IsAnimatedProperty );
-    }
-
-    protected override void OnRender( DrawingContext drawingContext )
-    {
-      if( this.HasArrangedContentPresenter && !this.HasRenderedFirstView )
-      {
-        this.HasRenderedFirstView = true;
-        if( this.RefocusViewOnFirstRender )
-        {
-          this.RefocusViewOnFirstRender = false;
-          bool oldAnimated = this.IsAnimated;
-          this.IsAnimated = false;
-          try
-          {
-            this.RefocusView();
-          }
-          finally
-          {
-            this.IsAnimated = oldAnimated;
-          }
-        }
-      }
-
-      base.OnRender( drawingContext );
-    }
-
-
-
-
-    private static void RefocusView( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = o as Zoombox;
-      zoombox.UpdateView( zoombox.CurrentView, true, false, zoombox.ViewStackIndex );
-    }
-
-    private void AttachToVisualTree()
-    {
-      if( _isUpdatingVisualTree )
-        return;
-
-      _isUpdatingVisualTree = true;
-
-      // detach from the old tree
-      this.DetachFromVisualTree();
-
-      // create the drag adorner for selection operations
-      _dragAdorner = new DragAdorner( this );
-
-      // check the template for a SelectionBrush resource
-      if( this.Template.Resources.Contains( "SelectionBrush" ) )
-        _dragAdorner.Brush = this.Template.Resources[ "SelectionBrush" ] as Brush;
-
-      // check the template for a SelectionPen resource
-      if( this.Template.Resources.Contains( "SelectionPen" ) )
-        _dragAdorner.Pen = this.Template.Resources[ "SelectionPen" ] as Pen;
-
-      // check the template for key bindings
-      if( this.Template.Resources.Contains( "InputBindings" ) )
-      {
-        InputBindingCollection inputBindings = this.Template.Resources[ "InputBindings" ] as InputBindingCollection;
-        if( inputBindings != null )
-        {
-          this.InputBindings.AddRange( inputBindings );
-        }
-      }
-
-      // locate the content presenter
-      _contentPresenter = VisualTreeHelperEx.FindDescendantByType( this, typeof( ContentPresenter ) ) as ContentPresenter;
-      if( _contentPresenter == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxTemplateNeedsContent" ) );
-
-      _verticalScrollBar = this.GetTemplateChild( PART_VerticalScrollBar ) as ScrollBar;
-      if( _verticalScrollBar == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "Zoombox vertical scrollBar not found." ) );
-
-      _verticalScrollBar.Scroll += this.VerticalScrollBar_Scroll;
-
-      _horizontalScrollBar = this.GetTemplateChild( PART_HorizontalScrollBar ) as ScrollBar;
-      if( _horizontalScrollBar == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "Zoombox horizontal scrollBar not found." ) );
-
-      _horizontalScrollBar.Scroll += this.HorizontalScrollBar_Scroll;
-
-      // check the template for an AdornerDecorator
-      AdornerLayer al = null;
-      AdornerDecorator ad = VisualTreeHelperEx.FindDescendantByType( this, typeof( AdornerDecorator ) ) as AdornerDecorator;
-      if( ad != null )
-      {
-        al = ad.AdornerLayer;
-      }
-      else
-      {
-        // look for an inherited adorner layer
-        try
-        {
-          al = AdornerLayer.GetAdornerLayer( this );
-        }
-        catch( Exception )
-        {
-        }
-      }
-
-      // add the drag adorner to the adorner layer
-      if( al != null )
-      {
-        al.Add( _dragAdorner );
-      }
-
-      // TODO: Why is it necessary to walk the visual tree the first time through?
-      // If we don't do the following, the content is not laid out correctly (centered) initially.
-      VisualTreeHelperEx.FindDescendantWithPropertyValue( this, Button.IsPressedProperty, true );
-
-      // User has not defined a ViewFinder, use the one from this template
-      if( this.GetValue( Zoombox.ViewFinderPropertyKey.DependencyProperty ) == null )
-      {
-        // set a reference to the ViewFinder element, if present
-        this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement );
-        Zoombox.SetViewFinderVisibility( this, Visibility.Collapsed );
-      }
-      else
-      {
-        //user has defined a ViewFinder, hide the one from this template
-        Zoombox.SetViewFinderVisibility( this, Visibility.Hidden );
-      }
-
-      // locate the view finder display panel
-      if( this.ViewFinder != null )
-      {
-        _viewFinderDisplay = VisualTreeHelperEx.FindDescendantByType( this.ViewFinder, typeof( ZoomboxViewFinderDisplay ) ) as ZoomboxViewFinderDisplay;
-      }
-
-      // if a ViewFinder was specified but no display panel is present, throw an exception
-      if( this.ViewFinder != null && _viewFinderDisplay == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxHasViewFinderButNotDisplay" ) );
-
-      // set up the VisualBrush and adorner for the display panel
-      if( _viewFinderDisplay != null )
-      {
-        // create VisualBrush for the view finder display panel
-        this.CreateVisualBrushForViewFinder( _content );
-
-        // hook up event handlers for dragging and resizing the viewport
-        _viewFinderDisplay.MouseMove += new MouseEventHandler( this.ViewFinderDisplayMouseMove );
-        _viewFinderDisplay.MouseLeftButtonDown += new MouseButtonEventHandler( this.ViewFinderDisplayBeginCapture );
-        _viewFinderDisplay.MouseLeftButtonUp += new MouseButtonEventHandler( this.ViewFinderDisplayEndCapture );
-
-        // bind the ViewportRect property of the display to the Viewport of the Zoombox
-        Binding binding = new Binding( "Viewport" );
-        binding.Mode = BindingMode.OneWay;
-        binding.Converter = new ViewFinderSelectionConverter( this );
-        binding.Source = this;
-        _viewFinderDisplay.SetBinding( ZoomboxViewFinderDisplay.ViewportRectProperty, binding );
-      }
-
-      this.UpdateViewFinderDisplayContentBounds();
-
-      // set up event handler to run once the content presenter has been arranged
-      _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged );
-
-      _isUpdatingVisualTree = false;
-    }
-
-    private void CreateVisualBrushForViewFinder( Visual visual )
-    {
-      _viewFinderDisplay.VisualBrush = new VisualBrush( visual );
-      _viewFinderDisplay.VisualBrush.Stretch = Stretch.Uniform;
-      _viewFinderDisplay.VisualBrush.AlignmentX = AlignmentX.Left;
-      _viewFinderDisplay.VisualBrush.AlignmentY = AlignmentY.Top;
-    }
-
-    private void ContentPresenterFirstArranged( object sender, EventArgs e )
-    {
-      // remove the handler
-      _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged );
-
-      // it's now safe to update the view
-      this.HasArrangedContentPresenter = true;
-      this.InvalidateVisual();
-
-      // temporarily disable animations
-      bool oldAnimated = IsAnimated;
-      this.IsAnimated = false;
-      try
-      {
-        // set the initial view
-        double scale = this.Scale;
-        Point position = this.Position;
-
-        // if there are items in the ViewStack and a ViewStackIndex is set, use it
-        if( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-        {
-          bool isInitialViewSet = false;
-          if( this.ViewStack.Count > 0 )
-          {
-            if( this.ViewStackIndex >= 0 )
-            {
-              if( this.ViewStackIndex > this.ViewStack.Count - 1 )
-              {
-                this.ViewStackIndex = this.ViewStack.Count - 1;
-              }
-              else
-              {
-                this.UpdateView( this.ViewStack[ this.ViewStackIndex ], false, false, this.ViewStackIndex );
-              }
-            }
-            else if( this.EffectiveViewStackMode != ZoomboxViewStackMode.Auto )
-            {
-              // if this is not an auto-stack, then ensure the index is set to a valid value
-              if( this.ViewStackIndex < 0 )
-              {
-                this.ViewStackIndex = 0;
-              }
-            }
-
-            // if a ViewStackIndex has been set, apply the scale and position values, iff different than the default values
-            if( this.ViewStackIndex >= 0 )
-            {
-              isInitialViewSet = true;
-              if( !DoubleHelper.IsNaN( scale ) || !PointHelper.IsEmpty( position ) )
-              {
-                this.UpdateView( new ZoomboxView( scale, position ), false, false );
-              }
-            }
-          }
-
-          if( !isInitialViewSet )
-          {
-            // set initial view according to the scale and position values and push it on the stack, as necessary
-            ZoomboxView initialView = new ZoomboxView( DoubleHelper.IsNaN( Scale ) ? 1.0 : Scale,
-              PointHelper.IsEmpty( position ) ? new Point() : position );
-
-            if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Auto )
-            {
-              this.ViewStack.PushView( initialView );
-              this.ViewStackIndex = 0;
-            }
-            else
-            {
-              this.UpdateView( initialView, false, false );
-            }
-          }
-        }
-        else
-        {
-          // just set initial view according to the scale and position values
-          ZoomboxView initialView = new ZoomboxView( DoubleHelper.IsNaN( Scale ) ? 1.0 : this.Scale, position );
-          this.UpdateView( initialView, false, false );
-        }
-      }
-      finally
-      {
-        IsAnimated = oldAnimated;
-      }
-      //When ViewFinder is modified, this will refresh the ZoomboxViewFinderDisplay
-      this.ZoomTo( this.Scale );
-    }
-
-    private void DetachFromVisualTree()
-    {
-      // remove the drag adorner
-      if( (_dragAdorner != null) && ( AdornerLayer.GetAdornerLayer( this ) != null ) )
-        AdornerLayer.GetAdornerLayer( this ).Remove( _dragAdorner );
-
-      // remove the layout updated handler, if present
-      if( _contentPresenter != null )
-      {
-        _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged );
-      }
-
-      //locate the vertical scrollBar
-      if( _verticalScrollBar != null )
-      {
-        _verticalScrollBar.Scroll -= this.VerticalScrollBar_Scroll;
-      }
-
-      //locate the horizontal scrollBar
-      if( _horizontalScrollBar != null )
-      {
-        _horizontalScrollBar.Scroll -= this.HorizontalScrollBar_Scroll;
-      }
-
-      // remove the view finder display panel's visual brush and adorner
-      if( _viewFinderDisplay != null )
-      {
-        _viewFinderDisplay.MouseMove -= new MouseEventHandler( this.ViewFinderDisplayMouseMove );
-        _viewFinderDisplay.MouseLeftButtonDown -= new MouseButtonEventHandler( this.ViewFinderDisplayBeginCapture );
-        _viewFinderDisplay.MouseLeftButtonUp -= new MouseButtonEventHandler( this.ViewFinderDisplayEndCapture );
-        BindingOperations.ClearBinding( _viewFinderDisplay, ZoomboxViewFinderDisplay.ViewportRectProperty );
-        _viewFinderDisplay = null;
-      }
-
-      // set object references to null
-      _contentPresenter = null;
-    }
-
-    private void Zoombox_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.SetScrollBars();
-    }
-
-    private void VerticalScrollBar_Scroll( object sender, ScrollEventArgs e )
-    {
-      double diff = -(e.NewValue + _relativePosition.Y);
-
-      if( e.ScrollEventType == ScrollEventType.LargeIncrement )
-      {
-        diff = -_verticalScrollBar.ViewportSize;
-      }
-      else if( e.ScrollEventType == ScrollEventType.LargeDecrement )
-      {
-        diff = _verticalScrollBar.ViewportSize;
-      }
-
-      this.OnDrag( new DragDeltaEventArgs( 0d, diff / this.Scale ), false );
-
-      // Raise the Scroll event to user
-      EventHandler<ScrollEventArgs> handler = this.Scroll;
-      if( handler != null )
-      {
-        handler( this, e );
-      }
-    }
-
-    private void HorizontalScrollBar_Scroll( object sender, ScrollEventArgs e )
-    {
-      double diff = -( e.NewValue + _relativePosition.X );
-      if( e.ScrollEventType == ScrollEventType.LargeIncrement )
-      {
-        diff = -_horizontalScrollBar.ViewportSize;
-      }
-      else if( e.ScrollEventType == ScrollEventType.LargeDecrement )
-      {
-        diff = _horizontalScrollBar.ViewportSize;
-      }
-
-      this.OnDrag( new DragDeltaEventArgs( diff / this.Scale, 0d ), false );
-
-      // Raise the Scroll event to user
-      EventHandler<ScrollEventArgs> handler = this.Scroll;
-      if( handler != null )
-      {
-        handler( this, e );
-      }
-    }
-
-    private void DragDisplayViewport( DragDeltaEventArgs e, bool end )
-    {
-      // get the scale of the view finder display panel, the selection rect, and the VisualBrush rect
-      double scale = _viewFinderDisplay.Scale;
-      Rect viewportRect = _viewFinderDisplay.ViewportRect;
-      Rect vbRect = _viewFinderDisplay.ContentBounds;
-
-      // if the entire content is visible, do nothing
-      if( viewportRect.Contains( vbRect ) )
-        return;
-
-      // ensure that we stay within the bounds of the VisualBrush
-      double dx = e.HorizontalChange;
-      double dy = e.VerticalChange;
-
-      // check left boundary
-      if( viewportRect.Left < vbRect.Left )
-      {
-        dx = Math.Max( 0, dx );
-      }
-      else if( viewportRect.Left + dx < vbRect.Left )
-      {
-        dx = vbRect.Left - viewportRect.Left;
-      }
-
-      // check right boundary
-      if( viewportRect.Right > vbRect.Right )
-      {
-        dx = Math.Min( 0, dx );
-      }
-      else if( viewportRect.Right + dx > vbRect.Left + vbRect.Width )
-      {
-        dx = vbRect.Left + vbRect.Width - viewportRect.Right;
-      }
-
-      // check top boundary
-      if( viewportRect.Top < vbRect.Top )
-      {
-        dy = Math.Max( 0, dy );
-      }
-      else if( viewportRect.Top + dy < vbRect.Top )
-      {
-        dy = vbRect.Top - viewportRect.Top;
-      }
-
-      // check bottom boundary
-      if( viewportRect.Bottom > vbRect.Bottom )
-      {
-        dy = Math.Min( 0, dy );
-      }
-      else if( viewportRect.Bottom + dy > vbRect.Top + vbRect.Height )
-      {
-        dy = vbRect.Top + vbRect.Height - viewportRect.Bottom;
-      }
-
-      // call the main OnDrag handler that is used when dragging the content directly
-      this.OnDrag( new DragDeltaEventArgs( -dx / scale / _viewboxFactor, -dy / scale / _viewboxFactor ), end );
-
-      // for a drag operation, update the origin with each delta
-      _originPoint = _originPoint + new Vector( dx, dy );
-    }
-
-    private void InitCommands()
-    {
-      CommandBinding binding = new CommandBinding( Zoombox.Back, this.GoBack, this.CanGoBack );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Center, this.CenterContent );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Fill, this.FillToBounds );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Fit, this.FitToBounds );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Forward, this.GoForward, this.CanGoForward );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Home, this.GoHome, this.CanGoHome );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanDown, this.PanDownExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanLeft, this.PanLeftExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanRight, this.PanRightExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanUp, this.PanUpExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Refocus, this.RefocusView, this.CanRefocusView );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.ZoomIn, this.ZoomInExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.ZoomOut, this.ZoomOutExecuted );
-      this.CommandBindings.Add( binding );
-    }
-
-    private void MonitorInput()
-    {
-      // cannot pre-process input in partial trust
-      if( this.HasUIPermission )
-      {
-        this.PreProcessInput();
-      }
-    }
-
-    private void OnContentSizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      this.UpdateViewFinderDisplayContentBounds();
-
-      if( this.HasArrangedContentPresenter )
-      {
-        if( this.HasRenderedFirstView )
-        {
-          this.SetScrollBars();
-          this.UpdateView( this.CurrentView, true, false, this.CurrentViewIndex );
-        }
-        else
-        {
-          // if the content size changes after the content presenter has been arranged,
-          // but before the first view is rendered, invalidate the render so we can refocus 
-          // the view on the first render
-          this.RefocusViewOnFirstRender = true;
-          this.InvalidateVisual();
-        }
-      }
-    }
-
-    private void OnDrag( DragDeltaEventArgs e, bool end )
-    {
-      Point relativePosition = _relativePosition;
-      double scale = this.Scale;
-      Point newPosition = relativePosition + ( this.ContentOffset * scale ) + new Vector( e.HorizontalChange * scale, e.VerticalChange * scale );
-      if( this.IsUsingScrollBars )
-      {
-        newPosition.X = Math.Max( Math.Min( newPosition.X, 0d ), -_horizontalScrollBar.Maximum );
-        newPosition.Y = Math.Max( Math.Min( newPosition.Y, 0d ), -_verticalScrollBar.Maximum );
-      }
-
-      // update the transform
-      this.UpdateView( new ZoomboxView( scale, newPosition ), false, end );
-    }
-
-    private void OnLayoutUpdated( object sender, EventArgs e )
-    {
-      this.UpdateViewport();
-    }
-
-    private void OnSelectRegion( DragDeltaEventArgs e, bool end )
-    {
-      // draw adorner rect
-      if( end )
-      {
-        _dragAdorner.Rect = Rect.Empty;
-
-        if( _trueContent != null )
-        {
-          // get the selected region (in the content's coordinate space) based on the adorner's last position and size
-          Rect selection =
-            new Rect(
-              this.TranslatePoint( _dragAdorner.LastPosition, _trueContent ),
-              this.TranslatePoint( _dragAdorner.LastPosition + new Vector( _dragAdorner.LastSize.Width, _dragAdorner.LastSize.Height ), _trueContent ) );
-
-          // zoom to the selection
-          this.ZoomTo( selection );
-        }
-      }
-      else
-      {
-        _dragAdorner.Rect =
-          Rect.Intersect(
-            new Rect(
-              _originPoint,
-              new Vector( e.HorizontalChange, e.VerticalChange ) ),
-            new Rect(
-              new Point( 0, 0 ),
-              new Point( this.RenderSize.Width, this.RenderSize.Height ) ) );
-      }
-    }
-
-    private void OnSizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      if( !this.HasArrangedContentPresenter )
-        return;
-
-      this.SetScrollBars();
-
-      // when the size is changing, the viewbox factor must be updated before updating the view
-      this.UpdateViewboxFactor();
-
-      bool oldIsAnimated = this.IsAnimated;
-      this.IsAnimated = false;
-      try
-      {
-        this.UpdateView( this.CurrentView, false, false, this.ViewStackIndex );
-      }
-      finally
-      {
-        this.IsAnimated = oldIsAnimated;
-      }
-    }
-
-    private void SetScrollBars()
-    {
-      if( _content == null || _verticalScrollBar == null || _horizontalScrollBar == null )
-        return;
-
-      var contentSize = ( _content is Viewbox ) ? ( ( Viewbox )_content ).Child.DesiredSize : this.RenderSize;
-
-      _verticalScrollBar.SmallChange = 10d;
-      _verticalScrollBar.LargeChange = 10d;
-      _verticalScrollBar.Minimum = 0d;
-      _verticalScrollBar.ViewportSize = this.RenderSize.Height;
-      _verticalScrollBar.Maximum = contentSize.Height - _verticalScrollBar.ViewportSize;
-
-      _horizontalScrollBar.SmallChange = 10d;
-      _horizontalScrollBar.LargeChange = 10d;
-      _horizontalScrollBar.Minimum = 0d;
-      _horizontalScrollBar.ViewportSize = this.RenderSize.Width;
-      _horizontalScrollBar.Maximum = contentSize.Width - _horizontalScrollBar.ViewportSize;
-    }
-
-    private void PreProcessInput()
-    {
-      // if mouse is over the Zoombox element or if it has keyboard focus, pre-process input 
-      // to update the KeyModifier trigger properties (e.g., DragModifiersAreActive)
-      if( this.IsMouseOver || this.IsKeyboardFocusWithin )
-      {
-        if( !this.IsMonitoringInput )
-        {
-          this.IsMonitoringInput = true;
-          InputManager.Current.PreNotifyInput += new NotifyInputEventHandler( this.PreProcessInput );
-          this.UpdateKeyModifierTriggerProperties();
-        }
-      }
-      else
-      {
-        if( this.IsMonitoringInput )
-        {
-          this.IsMonitoringInput = false;
-          InputManager.Current.PreNotifyInput -= new NotifyInputEventHandler( this.PreProcessInput );
-
-          this.SetAreDragModifiersActive( false );
-          this.SetAreRelativeZoomModifiersActive( false );
-          this.SetAreZoomModifiersActive( false );
-          this.SetAreZoomToSelectionModifiersActive( false );
-        }
-      }
-    }
-
-    private void PreProcessInput( object sender, NotifyInputEventArgs e )
-    {
-      if( e.StagingItem.Input is KeyEventArgs )
-      {
-        this.UpdateKeyModifierTriggerProperties();
-      }
-    }
-
-    private void ProcessMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( this.ZoomToSelectionModifiers.AreActive )
-      {
-        this.SetIsDraggingContent( false );
-        this.SetIsSelectingRegion( true );
-      }
-      else if( this.DragModifiers.AreActive )
-      {
-        this.SetIsSelectingRegion( false );
-        this.SetIsDraggingContent( true );
-      }
-      else
-      {
-        this.SetIsSelectingRegion( false );
-        this.SetIsDraggingContent( false );
-      }
-
-      // if nothing to do, just return
-      if( !this.IsSelectingRegion && !this.IsDraggingContent )
-        return;
-
-      // set the origin point and capture the mouse
-      _originPoint = e.GetPosition( this );
-      _contentPresenter.CaptureMouse();
-      e.Handled = true;
-      if( this.IsDraggingContent )
-      {
-        // execute the Drag operation
-        this.OnDrag( new DragDeltaEventArgs( 0, 0 ), false );
-      }
-      else if( this.IsSelectingRegion )
-      {
-        this.OnSelectRegion( new DragDeltaEventArgs( 0, 0 ), false );
-      }
-    }
-
-    private void ProcessMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      if( !this.IsDraggingContent && !this.IsSelectingRegion )
-        return;
-
-      bool endDrag = this.IsDraggingContent;
-
-      this.SetIsDraggingContent( false );
-      this.SetIsSelectingRegion( false );
-
-      _originPoint = new Point();
-      _contentPresenter.ReleaseMouseCapture();
-      e.Handled = true;
-
-      if( endDrag )
-      {
-        this.OnDrag( new DragDeltaEventArgs( 0, 0 ), true );
-      }
-      else
-      {
-        this.OnSelectRegion( new DragDeltaEventArgs( 0, 0 ), true );
-      }
-    }
-
-    private void ProcessMouseMove( MouseEventArgs e )
-    {
-      if( e.MouseDevice.LeftButton != MouseButtonState.Pressed )
-        return;
-
-      if( !this.IsDraggingContent && !this.IsSelectingRegion )
-        return;
-
-      Point pos = e.GetPosition( this );
-      e.Handled = true;
-
-      if( this.IsDraggingContent )
-      {
-        Vector delta = ( pos - _originPoint ) / this.Scale;
-        this.OnDrag( new DragDeltaEventArgs( delta.X, delta.Y ), false );
-        _originPoint = pos;
-      }
-      else if( this.IsSelectingRegion )
-      {
-        Vector delta = pos - _originPoint;
-        this.OnSelectRegion( new DragDeltaEventArgs( delta.X, delta.Y ), false );
-      }
-    }
-
-    private void ProcessMouseWheelZoom( MouseWheelEventArgs e )
-    {
-      if( _content == null )
-        return;
-
-      // check modifiers to see if there's work to do
-      bool doZoom = this.ZoomModifiers.AreActive;
-      bool doRelativeZoom = this.RelativeZoomModifiers.AreActive;
-
-      // can't do both, so assume relative zoom
-      if( doZoom && doRelativeZoom )
-      {
-        doZoom = false;
-      }
-
-      if( !( doZoom || doRelativeZoom ) )
-        return;
-
-      e.Handled = true;
-      double percentage = ( ( e.Delta / Zoombox.MOUSE_WHEEL_DELTA ) * this.ZoomPercentage ) / 100;
-
-      // Are we doing a zoom relative to the current mouse position?
-      if( doRelativeZoom )
-      {
-        this.Zoom( percentage, Mouse.GetPosition( _content ) );
-      }
-      else
-      {
-        this.Zoom( percentage );
-      }
-    }
-
-    private void ProcessNavigationButton( RoutedEventArgs e )
-    {
-      if( e is MouseButtonEventArgs )
-      {
-        MouseButtonEventArgs mbea = e as MouseButtonEventArgs;
-        if( mbea.ChangedButton == MouseButton.XButton1
-            || mbea.ChangedButton == MouseButton.XButton2 )
-        {
-          if( mbea.ChangedButton == MouseButton.XButton2 )
-          {
-            this.GoForward();
-          }
-          else
-          {
-            this.GoBack();
-          }
-          mbea.Handled = true;
-        }
-      }
-      else if( e is KeyEventArgs )
-      {
-        KeyEventArgs kea = e as KeyEventArgs;
-        if( kea.Key == Key.Back || kea.Key == Key.BrowserBack || kea.Key == Key.BrowserForward )
-        {
-          if( kea.Key == Key.BrowserForward )
-          {
-            this.GoForward();
-          }
-          else
-          {
-            this.GoBack();
-          }
-          kea.Handled = true;
-        }
-      }
-    }
-
-    private void ResizeDisplayViewport( DragDeltaEventArgs e, ResizeEdge relativeTo )
-    {
-      // get the existing viewport rect and scale
-      Rect viewportRect = _viewFinderDisplay.ViewportRect;
-      double scale = _viewFinderDisplay.Scale;
-
-      // ensure that we stay within the bounds of the VisualBrush
-      double x = Math.Max( _resizeViewportBounds.Left, Math.Min( _resizeDraggingPoint.X + e.HorizontalChange, _resizeViewportBounds.Right ) );
-      double y = Math.Max( _resizeViewportBounds.Top, Math.Min( _resizeDraggingPoint.Y + e.VerticalChange, _resizeViewportBounds.Bottom ) );
-
-      // get the selected region in the coordinate space of the content
-      Point anchorPoint = new Point( _resizeAnchorPoint.X / scale, _resizeAnchorPoint.Y / scale );
-      Vector newRegionVector = new Vector( ( x - _resizeAnchorPoint.X ) / scale / _viewboxFactor, ( y - _resizeAnchorPoint.Y ) / scale / _viewboxFactor );
-      Rect region = new Rect( anchorPoint, newRegionVector );
-
-      // now translate the region from the coordinate space of the content 
-      // to the coordinate space of the content presenter
-      region =
-        new Rect(
-          _content.TranslatePoint( region.TopLeft, _contentPresenter ),
-          _content.TranslatePoint( region.BottomRight, _contentPresenter ) );
-
-      // calculate actual scale value
-      double aspectX = this.RenderSize.Width / region.Width;
-      double aspectY = this.RenderSize.Height / region.Height;
-      scale = aspectX < aspectY ? aspectX : aspectY;
-
-      // scale relative to the anchor point
-      this.ZoomTo( scale, anchorPoint, false, false );
-    }
-
-    private void UpdateKeyModifierTriggerProperties()
-    {
-      this.SetAreDragModifiersActive( this.DragModifiers.AreActive );
-      this.SetAreRelativeZoomModifiersActive( this.RelativeZoomModifiers.AreActive );
-      this.SetAreZoomModifiersActive( this.ZoomModifiers.AreActive );
-      this.SetAreZoomToSelectionModifiersActive( this.ZoomToSelectionModifiers.AreActive );
-    }
-
-    private void UpdateView( ZoomboxView view, bool allowAnimation, bool allowStackAddition )
-    {
-      this.UpdateView( view, allowAnimation, allowStackAddition, -1 );
-    }
-
-    private void UpdateView( ZoomboxView view, bool allowAnimation, bool allowStackAddition, int stackIndex )
-    {
-      if( _contentPresenter == null || _content == null || !this.HasArrangedContentPresenter )
-        return;
-
-      // if an absolute view is being used and only a Scale value has been specified,
-      // use the ZoomTo() function to perform a relative zoom
-      if( view.ViewKind == ZoomboxViewKind.Absolute && PointHelper.IsEmpty( view.Position ) )
-      {
-        this.ZoomTo( view.Scale, allowStackAddition );
-        return;
-      }
-
-      // disallow reentrancy
-      if( !this.IsUpdatingView )
-      {
-        this.IsUpdatingView = true;
-        try
-        {
-          // determine the new scale and position
-          double newRelativeScale = _viewboxFactor;
-          Point newRelativePosition = new Point();
-          Rect region = Rect.Empty;
-          switch( view.ViewKind )
-          {
-            case ZoomboxViewKind.Empty:
-              break;
-
-            case ZoomboxViewKind.Absolute:
-              newRelativeScale = DoubleHelper.IsNaN( view.Scale ) ? _relativeScale : view.Scale;
-              newRelativePosition = PointHelper.IsEmpty( view.Position ) ? _relativePosition
-                  : new Point( view.Position.X, view.Position.Y ) - this.ContentOffset * newRelativeScale;
-              break;
-
-            case ZoomboxViewKind.Region:
-              region = view.Region;
-              break;
-
-            case ZoomboxViewKind.Center:
-              {
-                // get the current ContentRect in the coordinate space of the Zoombox control
-                Rect currentContentRect =
-                  new Rect(
-                    _content.TranslatePoint( this.ContentRect.TopLeft, this ),
-                    _content.TranslatePoint( this.ContentRect.BottomRight, this ) );
-
-                // inflate (or deflate) the rect by the appropriate amounts in the x & y directions
-                region = Rect.Inflate( currentContentRect,
-                    ( this.RenderSize.Width / _viewboxFactor - currentContentRect.Width ) / 2,
-                    ( this.RenderSize.Height / _viewboxFactor - currentContentRect.Height ) / 2 );
-
-                // now translate the centered rect back to the coordinate space of the content
-                region = new Rect( this.TranslatePoint( region.TopLeft, _content ), this.TranslatePoint( region.BottomRight, _content ) );
-              }
-              break;
-
-            case ZoomboxViewKind.Fit:
-              region = this.ContentRect;
-              break;
-
-            case ZoomboxViewKind.Fill:
-              region = this.CalculateFillRect();
-              break;
-          }
-
-          if( view.ViewKind != ZoomboxViewKind.Empty )
-          {
-            if( !region.IsEmpty )
-            {   // ZOOMING TO A REGION
-              this.CalculatePositionAndScale( region, ref newRelativePosition, ref newRelativeScale );
-            }
-            else if( view != ZoomboxView.Empty )
-            {   // USING ABSOLUTE POSITION AND SCALE VALUES
-
-              // ensure that the scale value falls within the valid range
-              if( newRelativeScale > MaxScale )
-              {
-                newRelativeScale = MaxScale;
-              }
-              else if( newRelativeScale < MinScale )
-              {
-                newRelativeScale = MinScale;
-              }
-            }
-
-            double currentScale = _relativeScale;
-            double currentX = _relativePosition.X;
-            double currentY = _relativePosition.Y;
-
-            ScaleTransform st = null;
-            TranslateTransform tt = null;
-            TransformGroup tg = null;
-
-            if( _contentPresenter.RenderTransform != Transform.Identity )
-            {
-              tg = _contentPresenter.RenderTransform as TransformGroup;
-              st = tg.Children[ 0 ] as ScaleTransform;
-              tt = tg.Children[ 1 ] as TranslateTransform;
-              currentScale = st.ScaleX;
-              currentX = tt.X;
-              currentY = tt.Y;
-            }
-
-            if( KeepContentInBounds == true )
-            {
-              Rect boundsRect = new Rect( new Size( this.ContentRect.Width * newRelativeScale, this.ContentRect.Height * newRelativeScale ) );
-
-              // Calc viewport rect (should be inside bounds content rect)
-              Point viewportPosition = new Point( -newRelativePosition.X, -newRelativePosition.Y );
-              Rect viewportRect = new Rect( viewportPosition, _contentPresenter.RenderSize );
-
-              if( DoubleHelper.AreVirtuallyEqual( _relativeScale, newRelativeScale ) ) // we are positioning the content, not scaling
-              {
-                // Handle the width and height seperately since the content extent 
-                // could be contained only partially in the viewport.  Also if the viewport is only 
-                // partially contained within the content extent.
-
-                //
-                // Content extent width is greater than the viewport's width (Zoomed in).  Make sure we restrict
-                // the viewport X inside the content.
-                //
-                if( this.IsGreaterThanOrClose( boundsRect.Width, viewportRect.Width ) )
-                {
-                  if( boundsRect.Right < viewportRect.Right )
-                  {
-                    newRelativePosition.X = -( boundsRect.Width - viewportRect.Width );
-                  }
-
-                  if( boundsRect.Left > viewportRect.Left )
-                  {
-                    newRelativePosition.X = 0;
-                  }
-                }
-                //
-                // Viewport width is greater than the content extent's width (Zoomed out).  Make sure we restrict
-                // the content X inside the viewport.
-                //
-                else if( this.IsGreaterThanOrClose( viewportRect.Width, boundsRect.Width ) )
-                {
-                  if( viewportRect.Right < boundsRect.Right )
-                  {
-                    newRelativePosition.X = viewportRect.Width - boundsRect.Width;
-                  }
-
-                  if( viewportRect.Left > boundsRect.Left )
-                  {
-                    newRelativePosition.X = 0;
-                  }
-                }
-
-                //
-                // Content extent height is greater than the viewport's height (Zoomed in).  Make sure we restrict
-                // the viewport Y inside the content.
-                //
-                if( this.IsGreaterThanOrClose( boundsRect.Height, viewportRect.Height ) )
-                {
-                  if( boundsRect.Bottom < viewportRect.Bottom )
-                  {
-                    newRelativePosition.Y = -( boundsRect.Height - viewportRect.Height );
-                  }
-
-                  if( boundsRect.Top > viewportRect.Top )
-                  {
-                    newRelativePosition.Y = 0;
-                  }
-                }
-                //
-                // Viewport height is greater than the content extent's height (Zoomed out).  Make sure we restrict
-                // the content Y inside the viewport.
-                //
-                else if( this.IsGreaterThanOrClose( viewportRect.Height, boundsRect.Height ) )
-                {
-                  if( viewportRect.Bottom < boundsRect.Bottom )
-                  {
-                    newRelativePosition.Y = viewportRect.Height - boundsRect.Height;
-                  }
-
-                  if( viewportRect.Top > boundsRect.Top )
-                  {
-                    newRelativePosition.Y = 0;
-                  }
-                }
-              }
-            }
-
-            st = new ScaleTransform( newRelativeScale / _viewboxFactor, newRelativeScale / _viewboxFactor );
-            tt = new TranslateTransform( newRelativePosition.X, newRelativePosition.Y );
-            tg = new TransformGroup();
-            tg.Children.Add( st );
-            tg.Children.Add( tt );
-
-            _contentPresenter.RenderTransform = tg;
-
-            var initialContentSize = ( _content is Viewbox ) ? ( ( Viewbox )_content ).Child.DesiredSize : this.RenderSize;
-            var scaledContentSize = new Size( initialContentSize.Width * newRelativeScale, initialContentSize.Height * newRelativeScale );
-
-            if( allowAnimation && IsAnimated )
-            {
-              DoubleAnimation daScale = new DoubleAnimation( currentScale, newRelativeScale / _viewboxFactor, AnimationDuration );
-              daScale.AccelerationRatio = this.AnimationAccelerationRatio;
-              daScale.DecelerationRatio = this.AnimationDecelerationRatio;
-
-              DoubleAnimation daTranslateX = new DoubleAnimation( currentX, newRelativePosition.X, AnimationDuration );
-              daTranslateX.AccelerationRatio = this.AnimationAccelerationRatio;
-              daTranslateX.DecelerationRatio = this.AnimationDecelerationRatio;
-
-              DoubleAnimation daTranslateY = new DoubleAnimation( currentY, newRelativePosition.Y, AnimationDuration );
-              daTranslateY.AccelerationRatio = this.AnimationAccelerationRatio;
-              daTranslateY.DecelerationRatio = this.AnimationDecelerationRatio;
-              daTranslateY.CurrentTimeInvalidated += new EventHandler( this.UpdateViewport );
-              daTranslateY.CurrentStateInvalidated += new EventHandler( this.ZoomAnimationCompleted );
-
-              // raise animation beginning event before beginning the animations
-              RaiseEvent( new RoutedEventArgs( AnimationBeginningEvent, this ) );
-
-              st.BeginAnimation( ScaleTransform.ScaleXProperty, daScale );
-              st.BeginAnimation( ScaleTransform.ScaleYProperty, daScale );
-              tt.BeginAnimation( TranslateTransform.XProperty, daTranslateX );
-              tt.BeginAnimation( TranslateTransform.YProperty, daTranslateY );
-
-              if( this.IsUsingScrollBars )
-              {
-                //Vertical scrollBar animations
-                DoubleAnimation verticalMaxAnimation = new DoubleAnimation();
-                verticalMaxAnimation.From = _verticalScrollBar.Maximum;
-                verticalMaxAnimation.To = scaledContentSize.Height - _verticalScrollBar.ViewportSize;
-                verticalMaxAnimation.Duration = AnimationDuration;
-                _verticalScrollBar.BeginAnimation( ScrollBar.MaximumProperty, verticalMaxAnimation );
-
-                DoubleAnimation verticalValueAnimation = new DoubleAnimation();
-                verticalValueAnimation.From = _verticalScrollBar.Value;
-                verticalValueAnimation.To = -newRelativePosition.Y;
-                verticalValueAnimation.Duration = AnimationDuration;
-                verticalValueAnimation.Completed += this.VerticalValueAnimation_Completed;
-                _verticalScrollBar.BeginAnimation( ScrollBar.ValueProperty, verticalValueAnimation );
-
-                //Horizontal scrollBar animations
-                DoubleAnimation horizontalMaxAnimation = new DoubleAnimation();
-                horizontalMaxAnimation.From = _horizontalScrollBar.Maximum;
-                horizontalMaxAnimation.To = scaledContentSize.Width - _horizontalScrollBar.ViewportSize;
-                horizontalMaxAnimation.Duration = AnimationDuration;
-                _horizontalScrollBar.BeginAnimation( ScrollBar.MaximumProperty, horizontalMaxAnimation );
-
-                DoubleAnimation horizontalValueAnimation = new DoubleAnimation();
-                horizontalValueAnimation.From = _horizontalScrollBar.Value;
-                horizontalValueAnimation.To = -newRelativePosition.X;
-                horizontalValueAnimation.Duration = AnimationDuration;
-                horizontalValueAnimation.Completed += this.HorizontalValueAnimation_Completed;
-                _horizontalScrollBar.BeginAnimation( ScrollBar.ValueProperty, horizontalValueAnimation );
-              }
-            }
-            else if( this.IsUsingScrollBars )
-            {
-              //Vertical scrollBar
-              _verticalScrollBar.Maximum = scaledContentSize.Height - _verticalScrollBar.ViewportSize;
-              _verticalScrollBar.Value = -newRelativePosition.Y;
-              //Horizontal scrollBar
-              _horizontalScrollBar.Maximum = scaledContentSize.Width - _horizontalScrollBar.ViewportSize;
-              _horizontalScrollBar.Value = -newRelativePosition.X;
-            }
-
-            // maintain the relative scale and position for dragging and animating purposes
-            _relativePosition = newRelativePosition;
-            _relativeScale = newRelativeScale;
-
-            // update the Scale and Position properties to keep them in sync with the current view
-            this.Scale = newRelativeScale;
-            _basePosition = newRelativePosition + this.ContentOffset * newRelativeScale;
-            this.UpdateViewport();
-          }
-
-          // add the current view to the view stack
-          if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Auto && allowStackAddition )
-          {
-            // if the last view was pushed on the stack within the last 300 milliseconds, discard it
-            // since proximally close views are probably the result of a mouse wheel scroll
-            if( this.ViewStack.Count > 1
-              && Math.Abs( DateTime.Now.Ticks - _lastStackAddition.Ticks ) < TimeSpan.FromMilliseconds( 300 ).Ticks )
-            {
-              this.ViewStack.RemoveAt( this.ViewStack.Count - 1 );
-              _lastStackAddition = DateTime.Now - TimeSpan.FromMilliseconds( 300 );
-            }
-
-            // if the current view is the same as the last view, do nothing
-            if( this.ViewStack.Count > 0 && view == this.ViewStack.SelectedView )
-            {
-              // do nothing
-            }
-            else
-            {
-              // otherwise, push the current view on stack
-              this.ViewStack.PushView( view );
-              this.ViewStackIndex++;
-              stackIndex = this.ViewStackIndex;
-
-              // update the timestamp for the last stack addition
-              _lastStackAddition = DateTime.Now;
-            }
-          }
-
-          // update the stack indices used by CurrentViewChanged event
-          _lastViewIndex = this.CurrentViewIndex;
-          this.SetCurrentViewIndex( stackIndex );
-
-          // set the new view parameters
-          // NOTE: this is the only place where the CurrentView member should be set
-          this.SetCurrentView( view );
-        }
-        finally
-        {
-          this.IsUpdatingView = false;
-        }
-      }
-    }
-
-    private bool IsGreaterThanOrClose( double value1, double value2 )
-    {
-      return value1 <= value2 ? DoubleHelper.AreVirtuallyEqual( value1, value2 ) : true;
-    }
-
-    private Rect CalculateFillRect()
-    {
-      // determine the x-y ratio of the current Viewport
-      double xyRatio = this.RenderSize.Width / this.RenderSize.Height;
-
-      // now find the maximal rect within the ContentRect that has the same ratio
-      double x = 0;
-      double y = 0;
-      double width = this.ContentRect.Width;
-      double height = this.ContentRect.Height;
-      if( xyRatio > width / height )
-      {
-        height = width / xyRatio;
-        y = ( this.ContentRect.Height - height ) / 2;
-      }
-      else
-      {
-        width = height * xyRatio;
-        x = ( this.ContentRect.Width - width ) / 2;
-      }
-
-      return new Rect( x, y, width, height );
-    }
-
-    private void CalculatePositionAndScale( Rect region, ref Point newRelativePosition, ref double newRelativeScale )
-    {
-      // if there is nothing to scale, just return
-      // if the region has no area, just return
-      if( region.Width == 0 || region.Height == 0 )
-        return;
-
-      // verify that the selected region intersects with the content, which prevents 
-      // the scale operation from zooming the content out of the current view
-      if( !this.ContentRect.IntersectsWith( region ) )
-        return;
-
-      // translate the region from the coordinate space of the content 
-      // to the coordinate space of the content presenter
-      region =
-        new Rect(
-          _content.TranslatePoint( region.TopLeft, _contentPresenter ),
-          _content.TranslatePoint( region.BottomRight, _contentPresenter ) );
-
-      // calculate actual zoom, which must fit the entire selection 
-      // while maintaining a 1:1 ratio
-      double aspectX = this.RenderSize.Width / region.Width;
-      double aspectY = this.RenderSize.Height / region.Height;
-      newRelativeScale = aspectX < aspectY ? aspectX : aspectY;
-
-      // ensure that the scale value falls within the valid range
-      if( newRelativeScale > this.MaxScale )
-      {
-        newRelativeScale = this.MaxScale;
-      }
-      else if( newRelativeScale < this.MinScale )
-      {
-        newRelativeScale = this.MinScale;
-      }
-
-      // determine the new content position for this zoom operation based 
-      // on HorizontalContentAlignment and VerticalContentAlignment
-      double horizontalOffset = 0;
-      double verticalOffset = 0;
-      switch( this.HorizontalContentAlignment )
-      {
-        case HorizontalAlignment.Center:
-        case HorizontalAlignment.Stretch:
-          horizontalOffset = ( this.RenderSize.Width - region.Width * newRelativeScale ) / 2;
-          break;
-
-        case HorizontalAlignment.Right:
-          horizontalOffset = ( this.RenderSize.Width - region.Width * newRelativeScale );
-          break;
-      }
-      switch( VerticalContentAlignment )
-      {
-        case VerticalAlignment.Center:
-        case VerticalAlignment.Stretch:
-          verticalOffset = ( this.RenderSize.Height - region.Height * newRelativeScale ) / 2;
-          break;
-
-        case VerticalAlignment.Bottom:
-          verticalOffset = ( this.RenderSize.Height - region.Height * newRelativeScale );
-          break;
-      }
-      newRelativePosition =
-        new Point( -region.TopLeft.X * newRelativeScale, -region.TopLeft.Y * newRelativeScale )
-          + new Vector( horizontalOffset, verticalOffset );
-    }
-
-    private void UpdateViewFinderDisplayContentBounds()
-    {
-      if( _content == null || _trueContent == null || _viewFinderDisplay == null )
-        return;
-
-      this.UpdateViewboxFactor();
-
-      // ensure the display panel has a size
-      Size contentSize = _content.RenderSize;
-      Size viewFinderSize = _viewFinderDisplay.AvailableSize;
-      if( viewFinderSize.Width > 0d && DoubleHelper.AreVirtuallyEqual( viewFinderSize.Height, 0d ) )
-      {
-        // update height to accomodate width, while keeping a ratio equal to the actual content
-        viewFinderSize = new Size( viewFinderSize.Width, contentSize.Height * viewFinderSize.Width / contentSize.Width );
-      }
-      else if( viewFinderSize.Height > 0d && DoubleHelper.AreVirtuallyEqual( viewFinderSize.Width, 0d ) )
-      {
-        // update width to accomodate height, while keeping a ratio equal to the actual content
-        viewFinderSize = new Size( contentSize.Width * viewFinderSize.Height / contentSize.Height, viewFinderSize.Width );
-      }
-
-      // determine the scale of the view finder display panel
-      double aspectX = viewFinderSize.Width / contentSize.Width;
-      double aspectY = viewFinderSize.Height / contentSize.Height;
-      double scale = aspectX < aspectY ? aspectX : aspectY;
-
-      // determine the rect of the VisualBrush
-      double vbWidth = contentSize.Width * scale;
-      double vbHeight = contentSize.Height * scale;
-
-      // set the ContentBounds and Scale properties on the view finder display panel
-      _viewFinderDisplay.Scale = scale;
-      _viewFinderDisplay.ContentBounds = new Rect( new Size( vbWidth, vbHeight ) );
-    }
-
-    private void UpdateViewboxFactor()
-    {
-      if( _content == null || _trueContent == null )
-        return;
-
-      double contentWidth = _content.RenderSize.Width;
-      double trueContentWidth = _trueContent.RenderSize.Width;
-
-      if( DoubleHelper.AreVirtuallyEqual( contentWidth, 0d ) || DoubleHelper.AreVirtuallyEqual( trueContentWidth, 0d ) )
-      {
-        _viewboxFactor = 1d;
-      }
-      else
-      {
-        _viewboxFactor = contentWidth / trueContentWidth;
-      }
-    }
-
-    private void UpdateViewport()
-    {
-      // if we haven't attached to the visual tree yet or we don't have content, just return
-      if( _contentPresenter == null || _trueContent == null )
-        return;
-
-      this.IsUpdatingViewport = true;
-      try
-      {
-        // calculate the current viewport
-        Rect viewport =
-          new Rect(
-            this.TranslatePoint( new Point( 0d, 0d ), _trueContent ),
-            this.TranslatePoint( new Point( RenderSize.Width, RenderSize.Height ), _trueContent ) );
-
-        // if the viewport has changed, set the Viewport dependency property
-        if( !DoubleHelper.AreVirtuallyEqual( viewport, this.Viewport ) )
-        {
-          this.SetValue( Zoombox.ViewportPropertyKey, viewport );
-        }
-      }
-      finally
-      {
-        this.IsUpdatingViewport = false;
-      }
-    }
-
-    private void UpdateViewport( object sender, EventArgs e )
-    {
-      this.UpdateViewport();
-    }
-
-    private void ViewFinderDisplayBeginCapture( object sender, MouseButtonEventArgs e )
-    {
-      const double ARBITRARY_LARGE_VALUE = 10000000000;
-
-      // if we need to acquire capture, the Tag property of the view finder display panel
-      // will be a ResizeEdge value.
-      if( _viewFinderDisplay.Tag is ResizeEdge )
-      {
-        // if the Tag is ResizeEdge.None, then its a drag operation; otherwise, its a resize
-        if( ( ResizeEdge )_viewFinderDisplay.Tag == ResizeEdge.None )
-        {
-          this.IsDraggingViewport = true;
-        }
-        else
-        {
-          this.IsResizingViewport = true;
-          Vector direction = new Vector();
-          switch( ( ResizeEdge )_viewFinderDisplay.Tag )
-          {
-            case ResizeEdge.TopLeft:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.TopLeft;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.BottomRight;
-              direction = new Vector( -1, -1 );
-              break;
-
-            case ResizeEdge.TopRight:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.TopRight;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.BottomLeft;
-              direction = new Vector( 1, -1 );
-              break;
-
-            case ResizeEdge.BottomLeft:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.BottomLeft;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.TopRight;
-              direction = new Vector( -1, 1 );
-              break;
-
-            case ResizeEdge.BottomRight:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.BottomRight;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.TopLeft;
-              direction = new Vector( 1, 1 );
-              break;
-            case ResizeEdge.Left:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Right,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              direction = new Vector( -1, 0 );
-              break;
-            case ResizeEdge.Top:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Top );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Bottom );
-              direction = new Vector( 0, -1 );
-              break;
-            case ResizeEdge.Right:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Right,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              direction = new Vector( 1, 0 );
-              break;
-            case ResizeEdge.Bottom:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Bottom );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Top );
-              direction = new Vector( 0, 1 );
-              break;
-          }
-          double scale = _viewFinderDisplay.Scale;
-          Rect contentRect = _viewFinderDisplay.ContentBounds;
-          Vector minVector = new Vector( direction.X * ARBITRARY_LARGE_VALUE, direction.Y * ARBITRARY_LARGE_VALUE );
-          Vector maxVector = new Vector( direction.X * contentRect.Width / MaxScale, direction.Y * contentRect.Height / MaxScale );
-          _resizeViewportBounds = new Rect( _resizeAnchorPoint + minVector, _resizeAnchorPoint + maxVector );
-        }
-
-        // store the origin of the operation and acquire capture
-        _originPoint = e.GetPosition( _viewFinderDisplay );
-        _viewFinderDisplay.CaptureMouse();
-        e.Handled = true;
-      }
-    }
-
-    private void ViewFinderDisplayEndCapture( object sender, MouseButtonEventArgs e )
-    {
-      // if a drag or resize is in progress, end it and release capture
-      if( this.IsDraggingViewport || this.IsResizingViewport )
-      {
-        // call the DragDisplayViewport method to end the operation
-        // and store the current position on the stack
-        this.DragDisplayViewport( new DragDeltaEventArgs( 0, 0 ), true );
-
-        // reset the dragging state variables and release capture
-        this.IsDraggingViewport = false;
-        this.IsResizingViewport = false;
-        _originPoint = new Point();
-        _viewFinderDisplay.ReleaseMouseCapture();
-        e.Handled = true;
-      }
-    }
-
-    private void ViewFinderDisplayMouseMove( object sender, MouseEventArgs e )
-    {
-      // if a drag operation is in progress, update the operation
-      if( e.MouseDevice.LeftButton == MouseButtonState.Pressed
-          && ( this.IsDraggingViewport || this.IsResizingViewport ) )
-      {
-        Point pos = e.GetPosition( _viewFinderDisplay );
-        Vector delta = pos - _originPoint;
-        if( this.IsDraggingViewport )
-        {
-          this.DragDisplayViewport( new DragDeltaEventArgs( delta.X, delta.Y ), false );
-        }
-        else
-        {
-          this.ResizeDisplayViewport( new DragDeltaEventArgs( delta.X, delta.Y ), ( ResizeEdge )_viewFinderDisplay.Tag );
-        }
-        e.Handled = true;
-      }
-      else
-      {
-        // update the cursor based on the nearest corner
-        Point mousePos = e.GetPosition( _viewFinderDisplay );
-        Rect viewportRect = _viewFinderDisplay.ViewportRect;
-        double cornerDelta = viewportRect.Width * viewportRect.Height > 100 ? 5.0
-            : Math.Sqrt( viewportRect.Width * viewportRect.Height ) / 2;
-
-        // if the mouse is within the Rect and the Rect does not encompass the entire content, set the appropriate cursor
-        if( viewportRect.Contains( mousePos )
-            && !DoubleHelper.AreVirtuallyEqual( Rect.Intersect( viewportRect, _viewFinderDisplay.ContentBounds ), _viewFinderDisplay.ContentBounds ) )
-        {
-          if( PointHelper.DistanceBetween( mousePos, viewportRect.TopLeft ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.TopLeft;
-            _viewFinderDisplay.Cursor = Cursors.SizeNWSE;
-          }
-          else if( PointHelper.DistanceBetween( mousePos, viewportRect.BottomRight ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.BottomRight;
-            _viewFinderDisplay.Cursor = Cursors.SizeNWSE;
-          }
-          else if( PointHelper.DistanceBetween( mousePos, viewportRect.TopRight ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.TopRight;
-            _viewFinderDisplay.Cursor = Cursors.SizeNESW;
-          }
-          else if( PointHelper.DistanceBetween( mousePos, viewportRect.BottomLeft ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.BottomLeft;
-            _viewFinderDisplay.Cursor = Cursors.SizeNESW;
-          }
-          else if( mousePos.X <= viewportRect.Left + cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Left;
-            _viewFinderDisplay.Cursor = Cursors.SizeWE;
-          }
-          else if( mousePos.Y <= viewportRect.Top + cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Top;
-            _viewFinderDisplay.Cursor = Cursors.SizeNS;
-          }
-          else if( mousePos.X >= viewportRect.Right - cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Right;
-            _viewFinderDisplay.Cursor = Cursors.SizeWE;
-          }
-          else if( mousePos.Y >= viewportRect.Bottom - cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Bottom;
-            _viewFinderDisplay.Cursor = Cursors.SizeNS;
-          }
-          else
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.None;
-            _viewFinderDisplay.Cursor = Cursors.SizeAll;
-          }
-        }
-        else
-        {
-          _viewFinderDisplay.Tag = null;
-          _viewFinderDisplay.Cursor = Cursors.Arrow;
-        }
-      }
-    }
-
-    private void ZoomAnimationCompleted( object sender, EventArgs e )
-    {
-      if( ( sender as AnimationClock ).CurrentState != ClockState.Active )
-      {
-        // remove the event handlers
-        ( sender as AnimationClock ).CurrentStateInvalidated -= new EventHandler( this.ZoomAnimationCompleted );
-        ( sender as AnimationClock ).CurrentTimeInvalidated -= new EventHandler( this.UpdateViewport );
-
-        // raise animation completed event
-        this.RaiseEvent( new RoutedEventArgs( Zoombox.AnimationCompletedEvent, this ) );
-      }
-    }
-
-    private void VerticalValueAnimation_Completed( object sender, EventArgs e )
-    {
-      //When the animaton is completed, with the FillBehavior to HoldEnd, 
-      //the ScrollBarValue will be overriden with the final animation value, preventing future scroll.
-      //To remove it use BeginAnimation with null.
-      //http://msdn.microsoft.com/en-us/library/aa970493(v=vs.110).aspx      
-
-      // only do this when all the overlapped animations are done or limits values reached.
-      if( ( _verticalScrollBar.Value == -_relativePosition.Y )
-        || ( _verticalScrollBar.Value == _verticalScrollBar.Maximum )
-        || ( _verticalScrollBar.Value == _verticalScrollBar.Minimum ) )
-      {
-        var finalValue = _verticalScrollBar.Value;
-        //this will reset Value to original value of animation
-        _verticalScrollBar.BeginAnimation( ScrollBar.ValueProperty, null );
-        //this will set to last value of the animation.
-        _verticalScrollBar.Value = finalValue;
-      }
-    }
-
-    private void HorizontalValueAnimation_Completed( object sender, EventArgs e )
-    {
-      //When the animaton is completed, with the FillBehavior to HoldEnd, 
-      //the ScrollBarValue will be overriden with the final animation value, preventing future scroll.
-      //To remove it use BeginAnimation with null.
-      //http://msdn.microsoft.com/en-us/library/aa970493(v=vs.110).aspx      
-
-      // only do this when all the overlapped animations are done or limits values reached.
-      if( ( _horizontalScrollBar.Value == -_relativePosition.X )
-        || ( _horizontalScrollBar.Value == _horizontalScrollBar.Maximum )
-        || ( _horizontalScrollBar.Value == _horizontalScrollBar.Minimum ) )
-      {
-        var finalValue = _horizontalScrollBar.Value;
-        //this will reset Value to original value of animation
-        _horizontalScrollBar.BeginAnimation( ScrollBar.ValueProperty, null );
-        //this will set to last value of the animation.
-        _horizontalScrollBar.Value = finalValue;
-      }
-    }
-
-    private void ZoomTo( double scale, bool allowStackAddition )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      // adjust the current scale relative to the zoom origin
-      this.ZoomTo( scale, this.GetZoomRelativePoint(), true, allowStackAddition );
-    }
-
-    private void ZoomTo( double scale, Point relativeTo, bool restrictRelativePointToContent, bool allowStackAddition )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      if( double.IsNaN( scale ) )
-        return;
-
-      // if necessary, verify that the relativeTo point falls within the content
-      if( restrictRelativePointToContent && !( new Rect( _content.RenderSize ) ).Contains( relativeTo ) )
-        return;
-
-      // ensure that the scale value falls within the valid range
-      if( scale > this.MaxScale )
-      {
-        scale = this.MaxScale;
-      }
-      else if( scale < this.MinScale )
-      {
-        scale = this.MinScale;
-      }
-
-      // internally, updates are always relative to the Zoombox control
-      Point translateFrom = relativeTo;
-      if( this.HasRenderedFirstView )
-      {
-        // Note that this TranslatePoint approach will not work until the first render occurs
-        relativeTo = _content.TranslatePoint( relativeTo, this );
-
-        // adjust translateFrom based on relativeTo
-        translateFrom = this.TranslatePoint( relativeTo, _contentPresenter );
-      }
-      else if( _contentPresenter != null )
-      {
-        // prior to the first render, just use the ContentPresenter's transform and do not adjust translateFrom
-        if( _contentPresenter.RenderTransform == Transform.Identity )
-        {
-          // in order for this approach to work, we must at least make one pass to update a generic view
-          // with Scale = 1.0 and Position = 0,0
-          this.UpdateView( new ZoomboxView( 1, new Point( 0, 0 ) ), false, false );
-        }
-
-        // now there should be a valid RenderTransform
-        relativeTo = ( _contentPresenter.RenderTransform as Transform ).Transform( relativeTo );
-      }
-
-      // determine the new content position for this zoom operation
-      Point translateTo = new Point( relativeTo.X - ( translateFrom.X * scale / _viewboxFactor ),
-          relativeTo.Y - ( translateFrom.Y * scale / _viewboxFactor ) )
-          + this.ContentOffset * scale / _viewboxFactor;
-      this.UpdateView( new ZoomboxView( scale, translateTo ), !this.IsResizingViewport, allowStackAddition );
-    }
-
-    private Point GetZoomRelativePoint()
-    {
-      Point zoomPoint;
-
-      if( ZoomOn == ZoomboxZoomOn.View )
-      {
-        // Transform the viewport point to the content
-        Point viewportZoomOrigin = new Point();
-
-        viewportZoomOrigin.X = this.Viewport.X + ( this.Viewport.Width * this.ZoomOrigin.X );
-        viewportZoomOrigin.Y = this.Viewport.Y + ( this.Viewport.Height * this.ZoomOrigin.Y );
-
-        Point contentZoomOrigin = _trueContent.TranslatePoint( viewportZoomOrigin, _content );
-
-        if( contentZoomOrigin.X < 0 )
-        {
-          contentZoomOrigin.X = 0;
-        }
-        else if( contentZoomOrigin.X > _content.RenderSize.Width )
-        {
-          contentZoomOrigin.X = _content.RenderSize.Width;
-        }
-
-        if( contentZoomOrigin.Y < 0 )
-        {
-          contentZoomOrigin.Y = 0;
-        }
-        else if( contentZoomOrigin.Y > _content.RenderSize.Height )
-        {
-          contentZoomOrigin.Y = _content.RenderSize.Height;
-        }
-
-        zoomPoint = contentZoomOrigin;
-      }
-      else
-      {
-        zoomPoint = new Point( _content.RenderSize.Width * ZoomOrigin.X, _content.RenderSize.Height * ZoomOrigin.Y );
-      }
-
-      return zoomPoint;
-    }
-
-    #region OnKeyDown Methods
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      if( !this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnKeyDown( e );
-    }
-
-    #endregion
-
-    #region OnMouseDown Methods
-
-    protected override void OnPreviewMouseDown( MouseButtonEventArgs e )
-    {
-      if( this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnPreviewMouseDown( e );
-    }
-
-    protected override void OnMouseDown( MouseButtonEventArgs e )
-    {
-      if( !this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnMouseDown( e );
-    }
-
-    #endregion
-
-    #region OnMouseEnter Methods
-
-    protected override void OnMouseEnter( MouseEventArgs e )
-    {
-      this.MonitorInput();
-
-      base.OnMouseEnter( e );
-    }
-
-    #endregion
-
-    #region OnMouseLeave Methods
-
-    protected override void OnMouseLeave( MouseEventArgs e )
-    {
-      this.MonitorInput();
-
-      base.OnMouseLeave( e );
-    }
-
-    #endregion
-
-    #region OnMouseLeftButton Methods
-
-    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonDown( e );
-      }
-
-      base.OnPreviewMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonDown( e );
-      }
-
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnPreviewMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonUp( e );
-      }
-
-      base.OnPreviewMouseLeftButtonUp( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonUp( e );
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-
-    #endregion
-
-    #region OnMouseMove Methods
-
-    protected override void OnPreviewMouseMove( MouseEventArgs e )
-    {
-      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseMove( e );
-      }
-
-      base.OnPreviewMouseMove( e );
-    }
-
-    protected override void OnMouseMove( MouseEventArgs e )
-    {
-      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseMove( e );
-      }
-
-      base.OnMouseMove( e );
-    }
-
-    #endregion
-
-    #region OnMouseWheel Methods
-
-    protected override void OnPreviewMouseWheel( MouseWheelEventArgs e )
-    {
-      if( this.ZoomOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseWheelZoom( e );
-      }
-
-      base.OnPreviewMouseWheel( e );
-    }
-
-    protected override void OnMouseWheel( MouseWheelEventArgs e )
-    {
-      if( !this.ZoomOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseWheelZoom( e );
-      }
-
-      base.OnMouseWheel( e );
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    // the default value for a single mouse wheel delta appears to be 28
-    private static int MOUSE_WHEEL_DELTA = 28;
-
-    // the content control's one and only content presenter
-    private ContentPresenter _contentPresenter = null;
-
-    //The Scrollbars
-    private ScrollBar _verticalScrollBar = null;
-    private ScrollBar _horizontalScrollBar = null;
-
-    // the content of the Zoombox (cast as a UIElement)
-    private UIElement _content = null;
-
-    // the drag adorner used for selecting a region in a zoom-to-selection operation
-    private DragAdorner _dragAdorner = null;
-
-    // the view stack
-    private ZoomboxViewStack _viewStack = null;
-
-    // the view finder display panel
-    // this is used to show the current viewport
-    private ZoomboxViewFinderDisplay _viewFinderDisplay = null;
-
-    // state variables used during drag and select operations
-    private Rect _resizeViewportBounds = Rect.Empty;
-    private Point _resizeAnchorPoint = new Point( 0, 0 );
-    private Point _resizeDraggingPoint = new Point( 0, 0 );
-    private Point _originPoint = new Point( 0, 0 );
-
-    private double _viewboxFactor = 1.0;
-    private double _relativeScale = 1.0;
-    private Point _relativePosition = new Point();
-    private Point _basePosition = new Point();
-
-    // used to track the time delta between stack operations
-    private DateTime _lastStackAddition;
-
-    // used to provide stack index when view changes
-    private int _lastViewIndex = -1;
-
-    private BitVector32 _cacheBits = new BitVector32( 0 );
-
-    #endregion
-
-    #region ViewFinderSelectionConverter Nested Type
-
-    private sealed class ViewFinderSelectionConverter : IValueConverter
-    {
-      public ViewFinderSelectionConverter( Zoombox zoombox )
-      {
-        _zoombox = zoombox;
-      }
-
-      public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        Rect viewport = ( Rect )value;
-        if( viewport.IsEmpty )
-          return viewport;
-
-        // adjust the viewport from the coordinate space of the Content element
-        // to the coordinate space of the view finder display panel
-        double scale = _zoombox._viewFinderDisplay.Scale * _zoombox._viewboxFactor;
-        Rect result = new Rect( viewport.Left * scale, viewport.Top * scale,
-            viewport.Width * scale, viewport.Height * scale );
-        result.Offset( _zoombox._viewFinderDisplay.ContentBounds.Left,
-            _zoombox._viewFinderDisplay.ContentBounds.Top );
-        return result;
-      }
-
-      public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        return null;
-      }
-
-      private readonly Zoombox _zoombox;
-    }
-
-    #endregion
-
-    #region DragAdorner Nested Type
-
-    internal sealed class DragAdorner : Adorner
-    {
-      public DragAdorner( UIElement adornedElement )
-        : base( adornedElement )
-      {
-        this.ClipToBounds = true;
-      }
-
-      public static readonly DependencyProperty BrushProperty =
-        DependencyProperty.Register( "Brush", typeof( Brush ), typeof( DragAdorner ),
-          new FrameworkPropertyMetadata( Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-      public Brush Brush
-      {
-        get
-        {
-          return ( Brush )this.GetValue( DragAdorner.BrushProperty );
-        }
-        set
-        {
-          this.SetValue( DragAdorner.BrushProperty, value );
-        }
-      }
-
-      public static readonly DependencyProperty PenProperty =
-        DependencyProperty.Register( "Pen", typeof( Pen ), typeof( DragAdorner ),
-          new FrameworkPropertyMetadata( new Pen( new SolidColorBrush( Color.FromArgb( 0x7F, 0x3F, 0x3F, 0x3F ) ), 2d ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-      public Pen Pen
-      {
-        get
-        {
-          return ( Pen )this.GetValue( DragAdorner.PenProperty );
-        }
-        set
-        {
-          this.SetValue( DragAdorner.PenProperty, value );
-        }
-      }
-
-      public static readonly DependencyProperty RectProperty =
-        DependencyProperty.Register( "Rect", typeof( Rect ), typeof( DragAdorner ),
-          new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender,
-            new PropertyChangedCallback( DragAdorner.OnRectChanged ) ) );
-
-      public Rect Rect
-      {
-        get
-        {
-          return ( Rect )this.GetValue( DragAdorner.RectProperty );
-        }
-        set
-        {
-          this.SetValue( DragAdorner.RectProperty, value );
-        }
-      }
-
-      private static void OnRectChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-      {
-        DragAdorner dragAdorner = ( DragAdorner )d;
-        Rect rect = ( Rect )e.NewValue;
-
-        // ignore empty values
-        if( rect.IsEmpty )
-          return;
-
-        // if the value is not empty, cache the position and size
-        dragAdorner._cachedPosition = ( ( Rect )e.NewValue ).TopLeft;
-        dragAdorner._cachedSize = ( ( Rect )e.NewValue ).Size;
-      }
-
-      public Point LastPosition
-      {
-        get
-        {
-          return _cachedPosition;
-        }
-      }
-
-      public Size LastSize
-      {
-        get
-        {
-          return _cachedSize;
-        }
-      }
-
-      protected override void OnRender( DrawingContext drawingContext )
-      {
-        drawingContext.DrawRectangle( Brush, Pen, Rect );
-      }
-
-      private Point _cachedPosition;
-      private Size _cachedSize;
-    }
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      IsUpdatingView = 0x00000001,
-      IsUpdatingViewport = 0x00000002,
-      IsDraggingViewport = 0x00000004,
-      IsResizingViewport = 0x00000008,
-      IsMonitoringInput = 0x00000010,
-      IsContentWrapped = 0x00000020,
-      HasArrangedContentPresenter = 0x00000040,
-      HasRenderedFirstView = 0x00000080,
-      RefocusViewOnFirstRender = 0x00000100,
-      HasUIPermission = 0x00000200,
-    }
-
-    #endregion
-
-    #region ResizeEdge Nested Type
-
-    private enum ResizeEdge
-    {
-      None,
-      TopLeft,
-      TopRight,
-      BottomLeft,
-      BottomRight,
-      Left,
-      Top,
-      Right,
-      Bottom,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
deleted file mode 100644
index bdbd47a3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Reflection;
-using System.Security;
-using System.Security.Permissions;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public class ZoomboxCursors
-  {
-    #region Constructors
-
-    static ZoomboxCursors()
-    {
-      try
-      {
-        new EnvironmentPermission( PermissionState.Unrestricted ).Demand();
-        _zoom = new Cursor( ResourceHelper.LoadResourceStream( Assembly.GetExecutingAssembly(), "Zoombox/Resources/Zoom.cur" ) );
-        _zoomRelative = new Cursor( ResourceHelper.LoadResourceStream( Assembly.GetExecutingAssembly(), "Zoombox/Resources/ZoomRelative.cur" ) );
-      }
-      catch( SecurityException )
-      {
-        // partial trust, so just use default cursors
-      }
-    }
-
-    #endregion
-
-    #region Zoom Static Property
-
-    public static Cursor Zoom
-    {
-      get
-      {
-        return _zoom;
-      }
-    }
-
-    private static readonly Cursor _zoom = Cursors.Arrow;
-
-    #endregion
-
-    #region ZoomRelative Static Property
-
-    public static Cursor ZoomRelative
-    {
-      get
-      {
-        return _zoomRelative;
-      }
-    }
-
-    private static readonly Cursor _zoomRelative = Cursors.Arrow;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
deleted file mode 100644
index 124a27aa..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  [TypeConverter( typeof( ZoomboxViewConverter ) )]
-  public class ZoomboxView
-  {
-    #region Constructors
-
-    public ZoomboxView()
-    {
-    }
-
-    public ZoomboxView( double scale )
-    {
-      this.Scale = scale;
-    }
-
-    public ZoomboxView( Point position )
-    {
-      this.Position = position;
-    }
-
-    public ZoomboxView( double scale, Point position )
-    {
-      this.Position = position;
-      this.Scale = scale;
-    }
-
-    public ZoomboxView( Rect region )
-    {
-      this.Region = region;
-    }
-
-    public ZoomboxView( double x, double y )
-      : this( new Point( x, y ) )
-    {
-    }
-
-    public ZoomboxView( double scale, double x, double y )
-      : this( scale, new Point( x, y ) )
-    {
-    }
-
-    public ZoomboxView( double x, double y, double width, double height )
-      : this( new Rect( x, y, width, height ) )
-    {
-    }
-
-    #endregion
-
-    #region Empty Static Property
-
-    public static ZoomboxView Empty
-    {
-      get
-      {
-        return _empty;
-      }
-    }
-
-    private static readonly ZoomboxView _empty = new ZoomboxView( ZoomboxViewKind.Empty );
-
-    #endregion
-
-    #region Fill Static Property
-
-    public static ZoomboxView Fill
-    {
-      get
-      {
-        return _fill;
-      }
-    }
-
-    private static readonly ZoomboxView _fill = new ZoomboxView( ZoomboxViewKind.Fill );
-
-    #endregion
-
-    #region Fit Static Property
-
-    public static ZoomboxView Fit
-    {
-      get
-      {
-        return _fit;
-      }
-    }
-
-    private static readonly ZoomboxView _fit = new ZoomboxView( ZoomboxViewKind.Fit );
-
-    #endregion
-
-    #region Center Static Property
-
-    public static ZoomboxView Center
-    {
-      get
-      {
-        return _center;
-      }
-    }
-
-    private static readonly ZoomboxView _center = new ZoomboxView( ZoomboxViewKind.Center );
-
-    #endregion
-
-    #region ViewKind Property
-
-    public ZoomboxViewKind ViewKind
-    {
-      get
-      {
-        if( _kindHeight > 0 )
-        {
-          return ZoomboxViewKind.Region;
-        }
-        else
-        {
-          return ( ZoomboxViewKind )( int )_kindHeight;
-        }
-      }
-    }
-
-    private double _kindHeight = ( int )ZoomboxViewKind.Empty;
-
-    #endregion
-
-    #region Position Property
-
-    public Point Position
-    {
-      get
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "PositionOnlyAccessibleOnAbsolute" ) );
-
-        return new Point( _x, _y );
-      }
-      set
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute && this.ViewKind != ZoomboxViewKind.Empty )
-          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
-
-        _x = value.X;
-        _y = value.Y;
-        _kindHeight = ( int )ZoomboxViewKind.Absolute;
-      }
-    }
-
-    private double _x = double.NaN;
-    private double _y = double.NaN;
-
-    #endregion
-
-    #region Scale Property
-
-    public double Scale
-    {
-      get
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "ScaleOnlyAccessibleOnAbsolute" ) );
-
-        return _scaleWidth;
-      }
-      set
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute && this.ViewKind != ZoomboxViewKind.Empty )
-          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
-
-        _scaleWidth = value;
-        _kindHeight = ( int )ZoomboxViewKind.Absolute;
-      }
-    }
-
-    private double _scaleWidth = double.NaN;
-
-    #endregion
-
-    #region Region Property
-
-    public Rect Region
-    {
-      get
-      {
-        // a region view has a positive _typeHeight value
-        if( _kindHeight < 0 )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "RegionOnlyAccessibleOnRegionalView" ) );
-
-        return new Rect( _x, _y, _scaleWidth, _kindHeight );
-      }
-      set
-      {
-        if( this.ViewKind != ZoomboxViewKind.Region && this.ViewKind != ZoomboxViewKind.Empty )
-          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
-
-        if( !value.IsEmpty )
-        {
-          _x = value.X;
-          _y = value.Y;
-          _scaleWidth = value.Width;
-          _kindHeight = value.Height;
-        }
-      }
-    }
-
-    #endregion
-
-    public override int GetHashCode()
-    {
-      return _x.GetHashCode() ^ _y.GetHashCode() ^ _scaleWidth.GetHashCode() ^ _kindHeight.GetHashCode();
-    }
-
-    public override bool Equals( object o )
-    {
-      bool result = false;
-      if( o is ZoomboxView )
-      {
-        ZoomboxView other = ( ZoomboxView )o;
-        if( this.ViewKind == other.ViewKind )
-        {
-          switch( this.ViewKind )
-          {
-            case ZoomboxViewKind.Absolute:
-              result = ( DoubleHelper.AreVirtuallyEqual( _scaleWidth, other._scaleWidth ) )
-                    && ( DoubleHelper.AreVirtuallyEqual( Position, other.Position ) );
-              break;
-
-            case ZoomboxViewKind.Region:
-              result = DoubleHelper.AreVirtuallyEqual( Region, other.Region );
-              break;
-
-            default:
-              result = true;
-              break;
-          }
-        }
-      }
-      return result;
-    }
-
-    public override string ToString()
-    {
-      switch( ViewKind )
-      {
-        case ZoomboxViewKind.Empty:
-          return "ZoomboxView: Empty";
-
-        case ZoomboxViewKind.Center:
-          return "ZoomboxView: Center";
-
-        case ZoomboxViewKind.Fill:
-          return "ZoomboxView: Fill";
-
-        case ZoomboxViewKind.Fit:
-          return "ZoomboxView: Fit";
-
-        case ZoomboxViewKind.Absolute:
-          return string.Format( "ZoomboxView: Scale = {0}; Position = ({1}, {2})", _scaleWidth.ToString( "f" ), _x.ToString( "f" ), _y.ToString( "f" ) );
-
-        case ZoomboxViewKind.Region:
-          return string.Format( "ZoomboxView: Region = ({0}, {1}, {2}, {3})", _x.ToString( "f" ), _y.ToString( "f" ), _scaleWidth.ToString( "f" ), _kindHeight.ToString( "f" ) );
-      }
-
-      return base.ToString();
-    }
-
-    private ZoomboxView( ZoomboxViewKind viewType )
-    {
-      _kindHeight = ( int )viewType;
-    }
-
-    #region Operators Methods
-
-    public static bool operator ==( ZoomboxView v1, ZoomboxView v2 )
-    {
-      if( ( object )v1 == null )
-        return ( object )v2 == null;
-
-      if( ( object )v2 == null )
-        return ( object )v1 == null;
-
-      return v1.Equals( v2 );
-    }
-
-    public static bool operator !=( ZoomboxView v1, ZoomboxView v2 )
-    {
-      return !( v1 == v2 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
deleted file mode 100644
index 1575827c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public class ZoomboxViewChangedEventArgs : PropertyChangedEventArgs<ZoomboxView>
-  {
-    #region Constructors
-
-    public ZoomboxViewChangedEventArgs(
-      ZoomboxView oldView,
-      ZoomboxView newView,
-      int oldViewStackIndex,
-      int newViewStackIndex )
-      : base( Zoombox.CurrentViewChangedEvent, oldView, newView )
-    {
-      _newViewStackIndex = newViewStackIndex;
-      _oldViewStackIndex = oldViewStackIndex;
-    }
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public int NewViewStackIndex
-    {
-      get
-      {
-        return _newViewStackIndex;
-      }
-    }
-
-    private readonly int _newViewStackIndex = -1;
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public int OldViewStackIndex
-    {
-      get
-      {
-        return _oldViewStackIndex;
-      }
-    }
-
-    private readonly int _oldViewStackIndex = -1;
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public bool IsNewViewFromStack
-    {
-      get
-      {
-        return _newViewStackIndex >= 0;
-      }
-    }
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public bool IsOldViewFromStack
-    {
-      get
-      {
-        return _oldViewStackIndex >= 0;
-      }
-    }
-
-    #endregion
-
-    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
-    {
-      ( ( ZoomboxViewChangedEventHandler )genericHandler )( genericTarget, this );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
deleted file mode 100644
index 1931a414..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public delegate void ZoomboxViewChangedEventHandler( object sender, ZoomboxViewChangedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
deleted file mode 100644
index 67cdaa7f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public sealed class ZoomboxViewConverter : TypeConverter
-  {
-    #region Converter Static Property
-
-    internal static ZoomboxViewConverter Converter
-    {
-      get
-      {
-        if( _converter == null )
-        {
-          _converter = new ZoomboxViewConverter();
-        }
-        return _converter;
-      }
-    }
-
-    private static ZoomboxViewConverter _converter; //null
-
-    #endregion
-
-    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( string ) )
-          || ( type == typeof( double ) )
-          || ( type == typeof( Point ) )
-          || ( type == typeof( Rect ) )
-          || ( base.CanConvertFrom( typeDescriptorContext, type ) );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( string ) )
-          || ( base.CanConvertTo( typeDescriptorContext, type ) );
-    }
-
-    public override object ConvertFrom( 
-      ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
-      object value )
-    {
-      ZoomboxView result = null;
-      if( value is double )
-      {
-        result = new ZoomboxView( ( double )value );
-      }
-      else if( value is Point )
-      {
-        result = new ZoomboxView( ( Point )value );
-      }
-      else if( value is Rect )
-      {
-        result = new ZoomboxView( ( Rect )value );
-      }
-      else if( value is string )
-      {
-        if( string.IsNullOrEmpty( ( value as string ).Trim() ) )
-        {
-          result = ZoomboxView.Empty;
-        }
-        else
-        {
-          switch( ( value as string ).Trim().ToLower() )
-          {
-            case "center":
-              result = ZoomboxView.Center;
-              break;
-
-            case "empty":
-              result = ZoomboxView.Empty;
-              break;
-
-            case "fill":
-              result = ZoomboxView.Fill;
-              break;
-
-            case "fit":
-              result = ZoomboxView.Fit;
-              break;
-
-            default:
-              // parse double values; respect the following separators: ' ', ';', or ','
-              List<double> values = new List<double>();
-              foreach( string token in ( value as string ).Split( new char[] { ' ', ';', ',' }, StringSplitOptions.RemoveEmptyEntries ) )
-              {
-                double d;
-                if( double.TryParse( token, out d ) )
-                {
-                  values.Add( d );
-                }
-                if( values.Count >= 4 )
-                {
-                  // disregard additional values
-                  break;
-                }
-              }
-
-              switch( values.Count )
-              {
-                case 1: // scale
-                  result = new ZoomboxView( values[ 0 ] );
-                  break;
-
-                case 2: // x, y
-                  result = new ZoomboxView( values[ 0 ], values[ 1 ] );
-                  break;
-
-                case 3: // scale, x, y
-                  result = new ZoomboxView( values[ 0 ], values[ 1 ], values[ 2 ] );
-                  break;
-
-                case 4: // x, y, width, height
-                  result = new ZoomboxView( values[ 0 ], values[ 1 ], values[ 2 ], values[ 3 ] );
-                  break;
-              }
-              break;
-          }
-        }
-      }
-      return ( result == null ? base.ConvertFrom( typeDescriptorContext, cultureInfo, value ) : result );
-    }
-
-    public override object ConvertTo( 
-      ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
-      object value, 
-      Type destinationType )
-    {
-      object result = null;
-      ZoomboxView view = value as ZoomboxView;
-
-      if( view != null )
-      {
-        if( destinationType == typeof( string ) )
-        {
-          result = "Empty";
-          switch( view.ViewKind )
-          {
-            case ZoomboxViewKind.Absolute:
-              if( PointHelper.IsEmpty( view.Position ) )
-              {
-                if( !DoubleHelper.IsNaN( view.Scale ) )
-                {
-                  result = view.Scale.ToString();
-                }
-              }
-              else if( DoubleHelper.IsNaN( view.Scale ) )
-              {
-                result = view.Position.X.ToString() + "," + view.Position.Y.ToString();
-              }
-              else
-              {
-                result = view.Scale.ToString() + ","
-                    + view.Position.X.ToString() + ","
-                    + view.Position.Y.ToString();
-              }
-              break;
-
-            case ZoomboxViewKind.Center:
-              result = "Center";
-              break;
-
-            case ZoomboxViewKind.Fill:
-              result = "Fill";
-              break;
-
-            case ZoomboxViewKind.Fit:
-              result = "Fit";
-              break;
-
-            case ZoomboxViewKind.Region:
-              result = view.Region.X.ToString() + ","
-                  + view.Region.Y.ToString() + ","
-                  + view.Region.Width.ToString() + ","
-                  + view.Region.Height.ToString();
-              break;
-          }
-        }
-      }
-      return ( result == null ? base.ConvertTo( typeDescriptorContext, cultureInfo, value, destinationType ) : result );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
deleted file mode 100644
index 52417ed4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public class ZoomboxViewException : Exception
-  {
-    #region Constructors
-
-    public ZoomboxViewException( string message ) 
-      : base( message )
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
deleted file mode 100644
index e2077a89..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public class ZoomboxViewFinderDisplay : FrameworkElement
-  {
-    #region Constructors
-
-    static ZoomboxViewFinderDisplay()
-    {
-      ZoomboxViewFinderDisplay.DefaultStyleKeyProperty.OverrideMetadata( typeof( ZoomboxViewFinderDisplay ), new FrameworkPropertyMetadata( typeof( ZoomboxViewFinderDisplay ) ) );
-    }
-
-    public ZoomboxViewFinderDisplay()
-    {
-    }
-
-    #endregion
-
-    #region Background Property
-
-    public static readonly DependencyProperty BackgroundProperty =
-      DependencyProperty.Register( "Background", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( new SolidColorBrush( Color.FromArgb( 0xC0, 0xFF, 0xFF, 0xFF ) ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Brush Background
-    {
-      get
-      {
-        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.BackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.BackgroundProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ContentBounds Property
-
-    private static readonly DependencyPropertyKey ContentBoundsPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ContentBounds", typeof( Rect ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( ( Rect )Rect.Empty, FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public static readonly DependencyProperty ContentBoundsProperty = ZoomboxViewFinderDisplay.ContentBoundsPropertyKey.DependencyProperty;
-
-    internal Rect ContentBounds
-    {
-      get
-      {
-        return ( Rect )this.GetValue( ZoomboxViewFinderDisplay.ContentBoundsProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ContentBoundsPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region ShadowBrush Property
-
-    public static readonly DependencyProperty ShadowBrushProperty =
-      DependencyProperty.Register( "ShadowBrush", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( new SolidColorBrush( Color.FromArgb( 0x80, 0xFF, 0xFF, 0xFF ) ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Brush ShadowBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.ShadowBrushProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ShadowBrushProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ViewportBrush Property
-
-    public static readonly DependencyProperty ViewportBrushProperty =
-      DependencyProperty.Register( "ViewportBrush", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Brush ViewportBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.ViewportBrushProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ViewportBrushProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ViewportPen Property
-
-    public static readonly DependencyProperty ViewportPenProperty =
-      DependencyProperty.Register( "ViewportPen", typeof( Pen ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( new Pen( new SolidColorBrush( Color.FromArgb( 0x80, 0x00, 0x00, 0x00 ) ), 1d ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Pen ViewportPen
-    {
-      get
-      {
-        return ( Pen )this.GetValue( ZoomboxViewFinderDisplay.ViewportPenProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ViewportPenProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ViewportRect Property
-
-    public static readonly DependencyProperty ViewportRectProperty =
-      DependencyProperty.Register( "ViewportRect", typeof( Rect ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Rect ViewportRect
-    {
-      get
-      {
-        return ( Rect )this.GetValue( ZoomboxViewFinderDisplay.ViewportRectProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ViewportRectProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region VisualBrush Property
-
-    private static readonly DependencyPropertyKey VisualBrushPropertyKey =
-      DependencyProperty.RegisterReadOnly( "VisualBrush", typeof( VisualBrush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( ( VisualBrush )null ) );
-
-    public static readonly DependencyProperty VisualBrushProperty = ZoomboxViewFinderDisplay.VisualBrushPropertyKey.DependencyProperty;
-
-    internal VisualBrush VisualBrush
-    {
-      get
-      {
-        return ( VisualBrush )this.GetValue( ZoomboxViewFinderDisplay.VisualBrushProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.VisualBrushPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region AvailableSize Internal Property
-
-    internal Size AvailableSize
-    {
-      get
-      {
-        return _availableSize;
-      }
-    }
-
-    private Size _availableSize = Size.Empty;
-
-    #endregion
-
-    #region Scale Internal Property
-
-    internal double Scale
-    {
-      get
-      {
-        return _scale;
-      }
-      set
-      {
-        _scale = value;
-      }
-    }
-
-    private double _scale = 1d;
-
-    #endregion
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      // Note that we do not call the Arrange method on any children
-      // because a ViewFinderDisplay has no children
-
-      // the control's RenderSize should always match its DesiredSize
-      return this.DesiredSize;
-    }
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      // Note that we do not call the Measure method on any children
-      // because a ViewFinderDisplay has no children.  It is merely used 
-      // as a surface for the view finder's VisualBrush.
-
-      // store the available size for use by the Zoombox control
-      _availableSize = availableSize;
-
-      // Simulate size-to-content for the display panel by ensuring a width and height
-      // based on the content bounds. Otherwise, the display panel may have no size, since it doesn't 
-      // contain content.
-      double width = DoubleHelper.IsNaN( this.ContentBounds.Width ) ? 0 : Math.Max( 0, this.ContentBounds.Width );
-      double height = DoubleHelper.IsNaN( this.ContentBounds.Height ) ? 0 : Math.Max( 0, this.ContentBounds.Height );
-      Size displayPanelSize = new Size( width, height );
-
-      // Now ensure that the result fits within the available size while maintaining
-      // the width/height ratio of the content bounds
-      if( displayPanelSize.Width > availableSize.Width || displayPanelSize.Height > availableSize.Height )
-      {
-        double aspectX = availableSize.Width / displayPanelSize.Width;
-        double aspectY = availableSize.Height / displayPanelSize.Height;
-        double scale = ( aspectX < aspectY ) ? aspectX : aspectY;
-        displayPanelSize = new Size( displayPanelSize.Width * scale, displayPanelSize.Height * scale );
-      }
-
-      return displayPanelSize;
-    }
-
-    protected override void OnRender( DrawingContext dc )
-    {
-      base.OnRender( dc );
-
-      dc.DrawRectangle( this.Background, null, this.ContentBounds );
-
-      dc.DrawRectangle( this.VisualBrush, null, this.ContentBounds );
-
-      if( this.ViewportRect.IntersectsWith( new Rect( this.RenderSize ) ) )
-      {
-        // draw shadow rectangles over the non-viewport regions
-        Rect r1 = new Rect( new Point( 0, 0 ), new Size( this.RenderSize.Width, Math.Max( 0, this.ViewportRect.Top ) ) );
-        Rect r2 = new Rect( new Point( 0, this.ViewportRect.Top ), new Size( Math.Max( 0, this.ViewportRect.Left ), this.ViewportRect.Height ) );
-        Rect r3 = new Rect( new Point( this.ViewportRect.Right, this.ViewportRect.Top ), new Size( Math.Max( 0, this.RenderSize.Width - this.ViewportRect.Right ), this.ViewportRect.Height ) );
-        Rect r4 = new Rect( new Point( 0, this.ViewportRect.Bottom ), new Size( this.RenderSize.Width, Math.Max( 0, this.RenderSize.Height - this.ViewportRect.Bottom ) ) );
-        dc.DrawRectangle( this.ShadowBrush, null, r1 );
-        dc.DrawRectangle( this.ShadowBrush, null, r2 );
-        dc.DrawRectangle( this.ShadowBrush, null, r3 );
-        dc.DrawRectangle( this.ShadowBrush, null, r4 );
-
-        // draw the rectangle around the viewport region
-        dc.DrawRectangle( this.ViewportBrush, this.ViewportPen, this.ViewportRect );
-      }
-      else
-      {
-        // if no part of the Rect is visible, just draw a 
-        // shadow over the entire content bounds
-        dc.DrawRectangle( this.ShadowBrush, null, new Rect( this.RenderSize ) );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
deleted file mode 100644
index ce90e01c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public enum ZoomboxViewKind
-  {
-    Absolute = -5,
-    Fit = -4,
-    Fill = -3,
-    Center = -2,
-    Empty = -1,
-    Region,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
deleted file mode 100644
index d44acb9d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
+++ /dev/null
@@ -1,555 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public sealed class ZoomboxViewStack : Collection<ZoomboxView>, IWeakEventListener
-  {
-    #region Constructors
-
-    public ZoomboxViewStack( Zoombox zoombox )
-    {
-      _zoomboxRef = new WeakReference( zoombox );
-    }
-
-    #endregion
-
-    #region SelectedView Property
-
-    public ZoomboxView SelectedView
-    {
-      get
-      {
-        int currentIndex = this.Zoombox.ViewStackIndex;
-        return ( currentIndex < 0 || currentIndex > Count - 1 ) ? ZoomboxView.Empty : this[ currentIndex ];
-      }
-    }
-
-    #endregion
-
-    #region AreViewsFromSource Internal Property
-
-    internal bool AreViewsFromSource
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.AreViewsFromSource ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.AreViewsFromSource ] = value;
-      }
-    }
-
-    #endregion
-
-    #region Source Internal Property
-
-    internal IEnumerable Source
-    {
-      get
-      {
-        return _source;
-      }
-    }
-
-    // if the view stack is generated by items within the ViewStackSource collection
-    // of the Zoombox, then we maintain a strong reference to the source
-    private IEnumerable _source; //null
-
-    #endregion
-
-    #region IsChangeFromSource Private Property
-
-    private bool IsChangeFromSource
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsChangeFromSource ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsChangeFromSource ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsMovingViews Private Property
-
-    private bool IsMovingViews
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsMovingViews ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsMovingViews ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsResettingViews Private Property
-
-    private bool IsResettingViews
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsResettingViews ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsResettingViews ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsSettingInitialViewAfterClear Private Property
-
-    private bool IsSettingInitialViewAfterClear
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsSettingInitialViewAfterClear ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsSettingInitialViewAfterClear ] = value;
-      }
-    }
-
-    #endregion
-
-    #region Zoombox Private Property
-
-    private Zoombox Zoombox
-    {
-      get
-      {
-        return _zoomboxRef.Target as Zoombox;
-      }
-    }
-
-    // maintain a weak reference to the Zoombox that owns the stack
-    private WeakReference _zoomboxRef;
-
-    #endregion
-
-    internal void ClearViewStackSource()
-    {
-      if( this.AreViewsFromSource )
-      {
-        this.AreViewsFromSource = false;
-        this.MonitorSource( false );
-        _source = null;
-        using( new SourceAccess( this ) )
-        {
-          this.Clear();
-        }
-        this.Zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
-      }
-    }
-
-    internal void PushView( ZoomboxView view )
-    {
-      // clear the forward stack
-      int currentIndex = this.Zoombox.ViewStackIndex;
-      while( this.Count - 1 > currentIndex )
-      {
-        this.RemoveAt( Count - 1 );
-      }
-      this.Add( view );
-    }
-
-    internal void SetViewStackSource( IEnumerable source )
-    {
-      if( _source != source )
-      {
-        this.MonitorSource( false );
-        _source = source;
-        this.MonitorSource( true );
-        this.AreViewsFromSource = true;
-        this.Zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
-        this.ResetViews();
-      }
-    }
-
-    protected override void ClearItems()
-    {
-      this.VerifyStackModification();
-
-      bool currentDeleted = ( this.Zoombox.CurrentViewIndex >= 0 );
-      base.ClearItems();
-      this.Zoombox.SetViewStackCount( Count );
-
-      // if resetting the views due to a change in the view source collection, just return
-      if( this.IsResettingViews )
-        return;
-
-      if( this.Zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Auto && this.Zoombox.CurrentView != ZoomboxView.Empty )
-      {
-        this.IsSettingInitialViewAfterClear = true;
-        try
-        {
-          this.Add( this.Zoombox.CurrentView );
-        }
-        finally
-        {
-          this.IsSettingInitialViewAfterClear = false;
-        }
-        this.Zoombox.ViewStackIndex = 0;
-        if( currentDeleted )
-        {
-          this.Zoombox.SetCurrentViewIndex( 0 );
-        }
-      }
-      else
-      {
-        this.Zoombox.ViewStackIndex = -1;
-        this.Zoombox.SetCurrentViewIndex( -1 );
-      }
-    }
-
-    protected override void InsertItem( int index, ZoomboxView view )
-    {
-      this.VerifyStackModification();
-
-      if( this.Zoombox.HasArrangedContentPresenter
-          && this.Zoombox.ViewStackIndex >= index
-          && !this.IsSettingInitialViewAfterClear
-          && !this.IsResettingViews
-          && !this.IsMovingViews )
-      {
-        bool oldUpdatingView = this.Zoombox.IsUpdatingView;
-        this.Zoombox.IsUpdatingView = true;
-        try
-        {
-          this.Zoombox.ViewStackIndex++;
-          if( this.Zoombox.CurrentViewIndex != -1 )
-          {
-            this.Zoombox.SetCurrentViewIndex( this.Zoombox.CurrentViewIndex + 1 );
-          }
-        }
-        finally
-        {
-          this.Zoombox.IsUpdatingView = oldUpdatingView;
-        }
-      }
-
-      base.InsertItem( index, view );
-      this.Zoombox.SetViewStackCount( Count );
-    }
-
-    protected override void RemoveItem( int index )
-    {
-      this.VerifyStackModification();
-
-      bool currentDeleted = ( this.Zoombox.ViewStackIndex == index );
-      if( !this.IsMovingViews )
-      {
-        // if an item below the current index was deleted 
-        // (or if the last item is currently selected and it was deleted),
-        // adjust the ViewStackIndex and CurrentViewIndex values
-        if( this.Zoombox.HasArrangedContentPresenter
-            && ( this.Zoombox.ViewStackIndex > index
-                || ( currentDeleted && this.Zoombox.ViewStackIndex == this.Zoombox.ViewStack.Count - 1 ) ) )
-        {
-          // if removing the last item, just clear the stack, which ensures the proper
-          // behavior based on the ViewStackMode
-          if( currentDeleted && this.Zoombox.ViewStack.Count == 1 )
-          {
-            this.Clear();
-            return;
-          }
-
-          bool oldUpdatingView = this.Zoombox.IsUpdatingView;
-          this.Zoombox.IsUpdatingView = true;
-          try
-          {
-            this.Zoombox.ViewStackIndex--;
-            if( this.Zoombox.CurrentViewIndex != -1 )
-            {
-              this.Zoombox.SetCurrentViewIndex( this.Zoombox.CurrentViewIndex - 1 );
-            }
-          }
-          finally
-          {
-            this.Zoombox.IsUpdatingView = oldUpdatingView;
-          }
-        }
-      }
-
-      base.RemoveItem( index );
-
-      // if the current view was deleted, we may need to update the view index 
-      // (unless a non-stack view is in effect)
-      if( !this.IsMovingViews && currentDeleted && this.Zoombox.CurrentViewIndex != -1 )
-      {
-        this.Zoombox.RefocusView();
-      }
-
-      this.Zoombox.SetViewStackCount( Count );
-    }
-
-    protected override void SetItem( int index, ZoomboxView view )
-    {
-      this.VerifyStackModification();
-
-      base.SetItem( index, view );
-
-      // if the set item is the current item, update the zoombox
-      if( index == this.Zoombox.CurrentViewIndex )
-      {
-        this.Zoombox.RefocusView();
-      }
-    }
-
-    private static ZoomboxView GetViewFromSourceItem( object item )
-    {
-      ZoomboxView view = ( item is ZoomboxView ) ? item as ZoomboxView : ZoomboxViewConverter.Converter.ConvertFrom( item ) as ZoomboxView;
-      if( view == null )
-        throw new InvalidCastException( string.Format( ErrorMessages.GetMessage( "UnableToConvertToZoomboxView" ), item ) );
-
-      return view;
-    }
-
-    private void InsertViews( int index, IList newItems )
-    {
-      using( new SourceAccess( this ) )
-      {
-        foreach( object item in newItems )
-        {
-          ZoomboxView view = ZoomboxViewStack.GetViewFromSourceItem( item );
-          if( index >= this.Count )
-          {
-            this.Add( view );
-          }
-          else
-          {
-            this.Insert( index, view );
-          }
-          index++;
-        }
-      }
-    }
-
-    private void MonitorSource( bool monitor )
-    {
-      if( _source != null && ( _source is INotifyCollectionChanged ) )
-      {
-        if( monitor )
-        {
-          CollectionChangedEventManager.AddListener( _source as INotifyCollectionChanged, this );
-        }
-        else
-        {
-          CollectionChangedEventManager.RemoveListener( _source as INotifyCollectionChanged, this );
-        }
-      }
-    }
-
-    private void MoveViews( int oldIndex, int newIndex, IList movedItems )
-    {
-      using( new SourceAccess( this ) )
-      {
-        int currentIndex = this.Zoombox.ViewStackIndex;
-        int indexAfterMove = currentIndex;
-
-        // adjust the current index, if it was affected by the move
-        if( !( ( oldIndex < currentIndex && newIndex < currentIndex )
-            || ( oldIndex > currentIndex && newIndex > currentIndex ) ) )
-        {
-          if( currentIndex >= oldIndex && currentIndex < oldIndex + movedItems.Count )
-          {
-            indexAfterMove += newIndex - oldIndex;
-          }
-          else if( currentIndex >= newIndex )
-          {
-            indexAfterMove += movedItems.Count;
-          }
-        }
-
-        this.IsMovingViews = true;
-        try
-        {
-          for( int i = 0; i < movedItems.Count; i++ )
-          {
-            this.RemoveAt( oldIndex );
-          }
-          for( int i = 0; i < movedItems.Count; i++ )
-          {
-            this.Insert( newIndex + i, ZoomboxViewStack.GetViewFromSourceItem( movedItems[ i ] ) );
-          }
-          if( indexAfterMove != currentIndex )
-          {
-            this.Zoombox.ViewStackIndex = indexAfterMove;
-            this.Zoombox.SetCurrentViewIndex( indexAfterMove );
-          }
-        }
-        finally
-        {
-          this.IsMovingViews = false;
-        }
-      }
-    }
-
-    private void OnSourceCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          this.InsertViews( e.NewStartingIndex, e.NewItems );
-          break;
-
-        case NotifyCollectionChangedAction.Move:
-          this.MoveViews( e.OldStartingIndex, e.NewStartingIndex, e.OldItems );
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          this.RemoveViews( e.OldStartingIndex, e.OldItems );
-          break;
-
-        case NotifyCollectionChangedAction.Replace:
-          this.ResetViews();
-          break;
-
-        case NotifyCollectionChangedAction.Reset:
-          this.ResetViews();
-          break;
-      }
-    }
-
-    private void ResetViews()
-    {
-      using( new SourceAccess( this ) )
-      {
-        int currentIndex = this.Zoombox.ViewStackIndex;
-        this.IsResettingViews = true;
-        try
-        {
-          this.Clear();
-          foreach( object item in _source )
-          {
-            ZoomboxView view = ZoomboxViewStack.GetViewFromSourceItem( item );
-            this.Add( view );
-          }
-
-          currentIndex = Math.Min( Math.Max( 0, currentIndex ), this.Count - 1 );
-
-          this.Zoombox.ViewStackIndex = currentIndex;
-          this.Zoombox.SetCurrentViewIndex( currentIndex );
-          this.Zoombox.RefocusView();
-        }
-        finally
-        {
-          this.IsResettingViews = false;
-        }
-      }
-    }
-
-    private void RemoveViews( int index, IList removedItems )
-    {
-      using( new SourceAccess( this ) )
-      {
-        for( int i = 0; i < removedItems.Count; i++ )
-        {
-          this.RemoveAt( index );
-        }
-      }
-    }
-
-    private void VerifyStackModification()
-    {
-      if( this.AreViewsFromSource && !this.IsChangeFromSource )
-        throw new InvalidOperationException( ErrorMessages.GetMessage( "ViewStackCannotBeManipulatedNow" ) );
-    }
-
-    #region IWeakEventListener Members
-
-    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        this.OnSourceCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    // to save memory, store bool variables in a bit vector
-    private BitVector32 _cacheBits = new BitVector32( 0 );
-
-    #endregion
-
-    #region SourceAccess Nested Type
-
-    private sealed class SourceAccess : IDisposable
-    {
-      public SourceAccess( ZoomboxViewStack viewStack )
-      {
-        _viewStack = viewStack;
-        _viewStack.IsChangeFromSource = true;
-      }
-
-      ~SourceAccess()
-      {
-        this.Dispose();
-      }
-
-      public void Dispose()
-      {
-        _viewStack.IsChangeFromSource = false;
-        _viewStack = null;
-        GC.SuppressFinalize( this );
-      }
-
-      private ZoomboxViewStack _viewStack;
-    }
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      AreViewsFromSource = 0x00000001,
-      IsChangeFromSource = 0x00000002,
-      IsResettingViews = 0x00000004,
-      IsMovingViews = 0x00000008,
-      IsSettingInitialViewAfterClear = 0x00000010,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
deleted file mode 100644
index b2cd4d22..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public enum ZoomboxViewStackMode
-  {
-    Auto,
-    Default,
-    Disabled,
-    Manual,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
deleted file mode 100644
index e79fa42f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public enum ZoomboxZoomOn
-  {
-    Content = 1,
-    View,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index b874ff28..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml
deleted file mode 100644
index 1ff141ef..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 6520b032..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml
deleted file mode 100644
index c66c7a5b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index a5de4c90..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml
deleted file mode 100644
index ebc36087..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 577f53ef..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml
deleted file mode 100644
index bac32b64..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 3c883a5d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml
deleted file mode 100644
index 21005230..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 7ef7d488..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml
deleted file mode 100644
index fac4f88b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 6dbffa9d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml
deleted file mode 100644
index 6073e848..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 64983f6b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml
deleted file mode 100644
index ac4f8e91..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml
deleted file mode 100644
index 20441958..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs
deleted file mode 100644
index 21c7c150..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "67CE6BABC918BB0DFE8DC3461FC60CFC"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.8794
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Converters;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Themes;
-
-
-namespace Xceed.Wpf.Toolkit {
-    
-    
-    /// <summary>
-    /// CollectionControlDialog
-    /// </summary>
-    public partial class CollectionControlDialog : Xceed.Wpf.Toolkit.CollectionControlDialogBase, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 32 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-        internal Xceed.Wpf.Toolkit.CollectionControl _collectionControl;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit;component/collectioncontrol/implementation/collectioncontroldi" +
-                    "alog.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._collectionControl = ((Xceed.Wpf.Toolkit.CollectionControl)(target));
-            return;
-            case 2:
-            
-            #line 45 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 49 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index b916a02a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml
deleted file mode 100644
index 38846b7a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 0619c304..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml
deleted file mode 100644
index 3f196648..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index fa5ee8bc..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml
deleted file mode 100644
index 4cd63494..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index baac2c04..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml
deleted file mode 100644
index 08e3f389..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 9c940e01..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml
deleted file mode 100644
index 2e0cd636..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 253434d9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml
deleted file mode 100644
index 333a0531..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index 4a59f27e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.8794
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 7450ffff..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml
deleted file mode 100644
index 7450ffff..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml
deleted file mode 100644
index 5cc6ef9c..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 60ab61b2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml
deleted file mode 100644
index c61fb4e3..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index c6bbc938..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml
deleted file mode 100644
index 908b213b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 0ec76570..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml
deleted file mode 100644
index 48bc2fb8..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index f5c9b250..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml
deleted file mode 100644
index ac215ede..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml
deleted file mode 100644
index be0e168f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml
deleted file mode 100644
index 49dcccc9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml
deleted file mode 100644
index d975e666..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml
deleted file mode 100644
index c1ff98ce..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 1f1f961d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml
deleted file mode 100644
index a34a412c..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 0422692a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml
deleted file mode 100644
index f3cb63d0..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 477cd5d9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml
deleted file mode 100644
index fe33b95b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 542cc0c0..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml
deleted file mode 100644
index 18413ed2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml
deleted file mode 100644
index 9185a595..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml
deleted file mode 100644
index 48a31512..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml
deleted file mode 100644
index 9d236e94..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 27bf28c9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml
deleted file mode 100644
index fcd60daf..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml
deleted file mode 100644
index 61cd3187..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml
deleted file mode 100644
index 33162478..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml
deleted file mode 100644
index a9265266..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml
deleted file mode 100644
index 961324fd..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml
deleted file mode 100644
index 852364b1..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml
deleted file mode 100644
index eb05d062..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml
deleted file mode 100644
index 513f2bc8..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml
deleted file mode 100644
index bbc5f6da..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml
deleted file mode 100644
index befe3d6f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml
deleted file mode 100644
index befe3d6f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml
deleted file mode 100644
index befe3d6f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml
deleted file mode 100644
index befe3d6f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml
deleted file mode 100644
index befe3d6f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index ec6ee972..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml
deleted file mode 100644
index 63401f2e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 1e02b0c0..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml
deleted file mode 100644
index 60f8b538..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 75f9f2ac..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml
deleted file mode 100644
index 75f9f2ac..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index eb728d1e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml
deleted file mode 100644
index 031d137f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index d851302f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml
deleted file mode 100644
index 2ced9da3..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
deleted file mode 100644
index 67ef7128..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5075ed49..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\WPFToolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\classic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.homestead.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.metallic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.g.cs
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\SelectorItem.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\WindowControl.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\SelectorItem.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\WindowControl.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Magnifier\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Brushes.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Buttons.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Common.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Glyphs.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Brushes_NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Buttons_NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Brushes.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Buttons.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Common.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Glyphs.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.g.resources
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.pdb
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources
deleted file mode 100644
index 0177b981..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref
deleted file mode 100644
index 3197da8a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref
+++ /dev/null
@@ -1,78 +0,0 @@
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index b906f59f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml
deleted file mode 100644
index b906f59f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 361b0ab7..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml
deleted file mode 100644
index d33fb716..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 600a3129..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml
deleted file mode 100644
index 56741d38..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 935e4660..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml
deleted file mode 100644
index 23af1f73..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 3508e2b8..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml
deleted file mode 100644
index 6e5a1ab5..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 3b900538..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml
deleted file mode 100644
index d9bb1085..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index fd051fae..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml
deleted file mode 100644
index 120591d9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 3597652c..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml
deleted file mode 100644
index de378cf5..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 30677ae9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml
deleted file mode 100644
index 15807053..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml
deleted file mode 100644
index ad8a69d7..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs
deleted file mode 100644
index 17bbf6ff..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "67CE6BABC918BB0DFE8DC3461FC60CFC"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.8922
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Converters;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Themes;
-
-
-namespace Xceed.Wpf.Toolkit {
-    
-    
-    /// <summary>
-    /// CollectionControlDialog
-    /// </summary>
-    public partial class CollectionControlDialog : Xceed.Wpf.Toolkit.CollectionControlDialogBase, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 32 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-        internal Xceed.Wpf.Toolkit.CollectionControl _collectionControl;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit;component/collectioncontrol/implementation/collectioncontroldi" +
-                    "alog.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._collectionControl = ((Xceed.Wpf.Toolkit.CollectionControl)(target));
-            return;
-            case 2:
-            
-            #line 45 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 49 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index a95a483a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml
deleted file mode 100644
index a43fd438..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 05790c6d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml
deleted file mode 100644
index aa007bd5..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 94a4c243..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml
deleted file mode 100644
index d6578189..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index dfb0d647..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml
deleted file mode 100644
index 70464bbb..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 0a5575d3..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml
deleted file mode 100644
index 0fcddc72..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index fd24dc8e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml
deleted file mode 100644
index 9e640a9e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index b47e38f8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.8922
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index bc3168d1..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml
deleted file mode 100644
index bc3168d1..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml
deleted file mode 100644
index 72821cad..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index f5d623a3..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml
deleted file mode 100644
index 83b800b4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 3dadf347..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml
deleted file mode 100644
index 483585f8..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 03cfcf7f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml
deleted file mode 100644
index 244b3b4f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index fae2919e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml
deleted file mode 100644
index fae2919e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml
deleted file mode 100644
index 020b7339..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml
deleted file mode 100644
index 9f82a188..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml
deleted file mode 100644
index 209980ed..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml
deleted file mode 100644
index 2323891b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index dfa9a959..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml
deleted file mode 100644
index 2c5af8ad..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 725db470..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml
deleted file mode 100644
index 9f6f721d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 76958085..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml
deleted file mode 100644
index e25a32cb..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index f0ce31d9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml
deleted file mode 100644
index b3931ab9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml
deleted file mode 100644
index ec8f8bb2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml
deleted file mode 100644
index 75831342..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml
deleted file mode 100644
index 51f36c85..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 0b4639b6..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml
deleted file mode 100644
index d8d2d5c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml
deleted file mode 100644
index 44a9ab30..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml
deleted file mode 100644
index a20e8ee2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml
deleted file mode 100644
index f0ed69be..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml
deleted file mode 100644
index afc0b488..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml
deleted file mode 100644
index b3f08921..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml
deleted file mode 100644
index df9c6e8b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml
deleted file mode 100644
index e262254f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml
deleted file mode 100644
index f0ed69be..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml
deleted file mode 100644
index 6c0ac4c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml
deleted file mode 100644
index 6c0ac4c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml
deleted file mode 100644
index 6c0ac4c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml
deleted file mode 100644
index 6c0ac4c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml
deleted file mode 100644
index 6c0ac4c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 50589740..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml
deleted file mode 100644
index 15911dea..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 1ce6d444..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml
deleted file mode 100644
index 3516773b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 4708a235..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml
deleted file mode 100644
index 4708a235..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index b7a2615b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml
deleted file mode 100644
index 24fab6dc..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index de3c6ca7..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml
deleted file mode 100644
index 70365904..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
deleted file mode 100644
index 67ef7128..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
deleted file mode 100644
index 29b79d19..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\classic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.homestead.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.metallic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.g.cs
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\WPFToolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\SelectorItem.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\WindowControl.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\SelectorItem.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\WindowControl.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Magnifier\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Brushes.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Buttons.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Common.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Glyphs.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Brushes_NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Buttons_NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Brushes.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Buttons.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Common.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Glyphs.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.g.resources
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.pdb
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources
deleted file mode 100644
index 90a6813e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref
deleted file mode 100644
index 87a2758c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref
+++ /dev/null
@@ -1,78 +0,0 @@
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index e194c8bb..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml
deleted file mode 100644
index e194c8bb..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/sn.snk b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/sn.snk
deleted file mode 100644
index 1bdc9120..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/sn.snk and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Xceed.Wpf.Toolkit.sln b/ExtendedWPFToolkitSolution_35/Xceed.Wpf.Toolkit.sln
deleted file mode 100644
index 80c162ce..00000000
--- a/ExtendedWPFToolkitSolution_35/Xceed.Wpf.Toolkit.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{2C3149D9-832B-4754-A27B-898A392344B5}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2C3149D9-832B-4754-A27B-898A392344B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C3149D9-832B-4754-A27B-898A392344B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C3149D9-832B-4754-A27B-898A392344B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C3149D9-832B-4754-A27B-898A392344B5}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/README.md b/README.md
index ffc5593e..1346b194 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@ This free and open source toolkit is provided under the [Microsoft Public Licens
 
 ## Latest news
 
-**June 27, 2018** v3.4.0 released with [42 bug fixes and improvements](../../wiki/Improvements-in-v3.4.0). Users of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) v3.4.0 on June 5, 2017 with [52 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus340), v3.5.0 on September 12, 2017 with [29 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus350), v3.6.0 on January 15, 2018 with [1 new control and 40 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus360), and v3.7.0 on June 18, 2018 with [27 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus370)
+**February 7, 2019** v3.5.0 released with [26 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0). Users of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) v3.5.0 on September 12, 2017 with [29 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus350), v3.6.0 on January 15, 2018 with [1 new control and 40 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus360), v3.7.0 on June 18, 2018 with [27 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0#Plus370) and v3.8.0 on January 30, 2019 with [45 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0#Plus380)
 
-**June 18, 2018** v3.7.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [27 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus370)
+**January 30, 2019** v3.8.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [45 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0#Plus380)
 
 **July 11, 2017:** The project's new home is Github. All issues from Codeplex are now located here.
 
-<a href=""><img src="https://user-images.githubusercontent.com/21266763/27752265-1db3056c-5dae-11e7-8ef4-9728f01494e7.png" width="172"/></a>
+<img src="https://user-images.githubusercontent.com/21266763/27752265-1db3056c-5dae-11e7-8ef4-9728f01494e7.png" width="172"/>
 
 ## Controls included
 
@@ -40,58 +40,55 @@ This free and open source toolkit is provided under the [Microsoft Public Licens
 <tr>
 <td><a href="../../wiki/ColorCanvas">ColorCanvas</a></td>
 <td><a href="../../wiki/ColorPicker">ColorPicker</a></td>
-<td><a href="../../wiki/DataGrid">DataGrid</a></td>
 <td><a href="../../wiki/DateTimePicker">DateTimePicker</a></td>
+<td><a href="../../wiki/DateTimeUpDown">DateTimeUpDown</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/DateTimeUpDown">DateTimeUpDown</a></td>
 <td><a href="../../wiki/DecimalUpDown">DecimalUpDown</a></td>
 <td><a href="../../wiki/DoubleUpDown">DoubleUpDown</a></td>
 <td><a href="../../wiki/DropDownButton">DropDownButton</a></td>
+<td><a href="../../wiki/IconButton">IconButton</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/IconButton">IconButton</a></td>
 <td><a href="../../wiki/IntegerUpDown">IntegerUpDown</a></td>
 <td><a href="../../wiki/LongUpDown">LongUpDown</a></td>
 <td><a href="../../wiki/Magnifier">Magnifier</a></td>
+<td><a href="../../wiki/MaskedTextBox">MaskedTextBox</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/MaskedTextBox">MaskedTextBox</a></td>
 <td><a href="../../wiki/MessageBox">MessageBox</a></td>
 <td><a href="../../wiki/MultiLineTextEditor">MultiLineTextEditor</a></td>
 <td><a href="../../wiki/PieChart">PieChart</a></td>
+<td><a href="../../wiki/PrimitiveTypeCollectionEditor">PrimitiveTypeCollEditor</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/PrimitiveTypeCollectionEditor">PrimitiveTypeCollEditor</a></td>
 <td><a href="../../wiki/PropertyGrid">PropertyGrid</a></td>
 <td><a href="../../wiki/RangeSlider">RangeSlider</a></td>
 <td><a href="../../wiki/RichTextBox">RichTextBox</a></td>
+<td><a href="../../wiki/RichTextBoxFormatBar">RichTextBoxFormatBar</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/RichTextBoxFormatBar">RichTextBoxFormatBar</a></td>
 <td><a href="../../wiki/ShortUpDown">ShortUpDown</a></td>
 <td><a href="../../wiki/SingleUpDown">SingleUpDown</a></td>
 <td><a href="../../wiki/SplitButton">SplitButton</a></td>
+<td><a href="../../wiki/SwitchPanel">2 SwitchPanels</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/SwitchPanel">SwitchPanel</a></td>
 <td><a href="../../wiki/TimelinePanel">TimelinePanel</a></td>
 <td><a href="../../wiki/TimePicker">TimePicker</a></td>
 <td><a href="../../wiki/TimeSpanUpDown">TimeSpanUpDown</a></td>
+<td><a href="../../wiki/ValueRangeTextBox">ValueRangeTextBox</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/ValueRangeTextBox">ValueRangeTextBox</a></td>
 <td><a href="../../wiki/WatermarkPasswordBox">WatermarkPasswordBox</a></td>
 <td><a href="../../wiki/WatermarkTextBox">WatermarkTextBox</a></td>
 <td><a href="../../wiki/WatermarkComboBox">WatermarkComboBox</a></td>
+<td><a href="../../wiki/WindowContainer">WindowContainer</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/WindowContainer">WindowContainer</a></td>
 <td><a href="../../wiki/WindowControl">WindowControl</a></td>
 <td><a href="../../wiki/Wizard">Wizard</a></td>
 <td><a href="../../wiki/Zoombox">Zoombox</a></td>
-</tr>
-<tr>
 <td><a href="../../wiki/Themes-Usage-Instructions">Windows 8 Theme</a></td>
 </tr>
 </table>
@@ -103,37 +100,37 @@ This free and open source toolkit is provided under the [Microsoft Public Licens
 <td><a href="../../wiki/Charts">Charts</a></td>
 <td><a href="../../wiki/ChildWindow-Plus">ChildWindow Plus</a></td>
 <td><a href="../../wiki/ExtendedTabControl">ExtendedTabControl</a></td>
-<td><a href="../../wiki/FilePicker-Plus">FilePicker Plus</a></td>
+<td><a href="../../wiki/DataGrid">DataGrid</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/Material-Design-controls">Material Design controls</a></td>
+<td><a href="../../wiki/FilePicker">FilePicker</a></td>
+<td><a href="../../wiki/Material-Design-controls">21 Material Design controls</a></td>
 <td><a href="../../wiki/MessageBox-Plus">MessageBox Plus</a></td>
 <td><a href="../../wiki/MultiCalendar">MultiCalendar</a></td>
-<td><a href="../../wiki/MultiColumnComboBox">MultiColumnComboBox</a></td>
 </tr>
 <tr>
+<td><a href="../../wiki/MultiColumnComboBox">MultiColumnComboBox</a></td>
 <td><a href="../../wiki/PileFlowPanel">PileFlowPanel</a></td>
 <td><a href="../../wiki/PropertyGrid-Plus">PropertyGrid Plus</a></td>
 <td><a href="../../wiki/RadialGauge">RadialGauge</a></td>
-<td><a href="../../wiki/Rating">Rating</a></td>
 </tr>
 <tr>
+<td><a href="../../wiki/Rating">Rating</a></td>
 <td><a href="../../wiki/SlideShow">SlideShow</a></td>
 <td><a href="../../wiki/StyleableWindow">StyleableWindow</a></td>
-<td><a href="../../wiki/SwitchPanel-Plus">SwitchPanel Plus</a></td>
-<td><a href="../../wiki/ToggleSwitch">ToggleSwitch</a></td>
+<td><a href="../../wiki/SwitchPanel-Plus">12 new SwitchPanels</a></td>
 </tr>
 <tr>
+<td><a href="../../wiki/ToggleSwitch">ToggleSwitch</a></td>
 <td><a href="../../wiki/TokenizedTextBox">TokenizedTextBox</a></td>
 <td><a href="../../wiki/Ultimate-ListBox">Ultimate ListBox</a></td>
-<td><a href="../../wiki/WatermarkPasswordBox">WatermarkPasswordBox</a></td>
 <td><a href="../../wiki/WindowControl-Plus">WindowControl Plus</a></td>
 </tr>
 <tr>
 <td><a href="../../wiki/Themes-Usage-Instructions">Windows 10 theme</a></td>
-<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">Metro theme</a></td>
-<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">Office theme</a></td>
-<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">1 or more release ahead</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">2 Metro themes</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">3 Office themes</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">2+ releases ahead</a></td>
 </tr>
 </table>
 
@@ -142,6 +139,7 @@ This free and open source toolkit is provided under the [Microsoft Public Licens
 <table>
 <tr>
 <td><a href="../../wiki/Advanced-DataGrid">Advanced DataGrid</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">10 new DataGrid editors</a></td>
 <td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">3D Views for WPF</a></td>
 <td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">More themes</a></td>
 <td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">All base WPF controls themed</a></td>
@@ -150,6 +148,8 @@ This free and open source toolkit is provided under the [Microsoft Public Licens
 
 ## Release history
 
+* **February 7, 2019 v3.5.0 released with [26 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0).**
+* January 30, 2019, released v3.8.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [45 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0#Plus380).
 * **June 27, 2018 v3.4.0 released with [42 bug fixes and improvements](../../wiki/Improvements-in-v3.4.0).**
 * June 18, 2018, released v3.7.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [27 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus370).
 * **March 5, 2018, released v3.3.0 with [a major update to the DataGrid and 35 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0).**